L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-68822-master' of git://github.com/ferranrecio/moodle

Browse Source
This commit is contained in:
Adrian Greeve
2020-05-28 11:49:37 +08:00
parent 5143106813 5567c5e833
commit 9e1ace3fb5
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/h5pactivity/tests/behat/add_h5pactivity.feature
+4 -3
View File
@@ -24,12 +24,13 @@ Feature: Add H5P activity
Scenario: Add a h5pactivity activity to a course
When I add a "H5P" to section "1"
And I set the following fields to these values:
| Name | Awesome H5P package |
| Description | Description |
| Name | Awesome H5P package |
| Description | H5P activity Description |
And I upload "h5p/tests/fixtures/ipsums.h5p" file to "Package file" filemanager
And I click on "Save and display" "button"
And I wait until the page is ready
Then I switch to "h5p-player" class iframe
Then I should see "H5P activity Description"
And I switch to "h5p-player" class iframe
And I switch to "h5p-iframe" class iframe
And I should see "Lorum ipsum"
And I should not see "Reuse"
mod/h5pactivity/view.php
+5
View File
@@ -70,6 +70,11 @@ $PAGE->set_context($context);
echo $OUTPUT->header();
echo $OUTPUT->heading(format_string($moduleinstance->name));
$instance = $manager->get_instance();
if (!empty($instance->intro)) {
echo $OUTPUT->box(format_module_intro('h5pactivity', $instance, $cm->id), 'generalbox', 'intro');
}
// Attempts review.
if ($manager->can_view_all_attempts()) {
$reviewurl = new moodle_url('report.php', ['a' => $cm->instance]);