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

Merge branch 'MDL-67920-master' of git://github.com/aanabit/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2020-02-25 23:32:17 +01:00
parent db7861cf7a f531a30252
commit b5220abb0f
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
h5p/classes/form/uploadlibraries_form.php
+1 -1
View File
@@ -52,6 +52,6 @@ class uploadlibraries_form extends \moodleform {
$mform->addHelpButton('h5ppackage', 'h5ppackage', 'core_h5p');
$mform->addRule('h5ppackage', null, 'required');
$this->add_action_buttons(false, get_string('uploadlibraries', 'core_h5p'));
$mform->addElement('submit', 'uploadlibraries', get_string('uploadlibraries', 'core_h5p'));
}
}
h5p/libraries.php
+2 -2
View File
@@ -34,9 +34,9 @@ $url = new \moodle_url("/h5p/libraries.php");
$PAGE->set_context($context);
$PAGE->set_url($url);
$PAGE->set_title($pagetitle);
$PAGE->set_pagelayout('admin');
$PAGE->set_heading($pagetitle);
$PAGE->set_title("$SITE->shortname: " . $pagetitle);
$PAGE->set_heading($SITE->fullname);
echo $OUTPUT->header();
echo $OUTPUT->heading($pagetitle);
h5p/tests/behat/h5p_libraries.feature
+3 -3
View File
@@ -13,7 +13,7 @@ Feature: Upload and list H5P libraries and content types installed
Given I log in as "admin"
And I navigate to "H5P > Manage H5P content types" in site administration
When I upload "h5p/tests/fixtures/h5ptest.zip" file to "H5P content type" filemanager
And I click on "Upload H5P content types" "button" in the "#fitem_id_submitbutton" "css_element"
And I click on "Upload H5P content types" "button" in the "#fitem_id_uploadlibraries" "css_element"
And I wait until the page is ready
Then I should see "Invalid H5P content type"
And I should not see "Installed H5P"
@@ -23,7 +23,7 @@ Feature: Upload and list H5P libraries and content types installed
Given I log in as "admin"
And I navigate to "H5P > Manage H5P content types" in site administration
When I upload "h5p/tests/fixtures/filltheblanks.h5p" file to "H5P content type" filemanager
And I click on "Upload H5P content types" "button" in the "#fitem_id_submitbutton" "css_element"
And I click on "Upload H5P content types" "button" in the "#fitem_id_uploadlibraries" "css_element"
And I wait until the page is ready
Then I should see "H5P content types uploaded successfully"
And I should see "Installed H5P"
@@ -36,7 +36,7 @@ Feature: Upload and list H5P libraries and content types installed
And I should see "1.4" in the "Question" "table_row"
And I should not see "1.3" in the "Question" "table_row"
And I upload "h5p/tests/fixtures/essay.zip" file to "H5P content type" filemanager
And I click on "Upload H5P content types" "button" in the "#fitem_id_submitbutton" "css_element"
And I click on "Upload H5P content types" "button" in the "#fitem_id_uploadlibraries" "css_element"
And I wait until the page is ready
# Existing content types are kept and new added
And I should see "Fill in the Blanks"