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

Merge branch 'MDL-52140' of git://github.com/stronk7/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2015-11-17 16:27:42 +00:00
parent a461fcf9db 6d29c4acdd
commit 14c855d8cd
103 changed files with 406 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/customlang/db/upgrade.php
+3
View File
@@ -54,5 +54,8 @@ function xmldb_tool_customlang_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
admin/tool/log/db/upgrade.php
+3
View File
@@ -52,5 +52,8 @@ function xmldb_tool_log_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
admin/tool/log/store/database/db/upgrade.php
+3
View File
@@ -42,5 +42,8 @@ function xmldb_logstore_database_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
admin/tool/log/store/standard/db/upgrade.php
+3
View File
@@ -120,5 +120,8 @@ function xmldb_logstore_standard_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
admin/tool/monitor/db/upgrade.php
+3
View File
@@ -56,5 +56,8 @@ function xmldb_tool_monitor_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
auth/cas/db/upgrade.php
+3
View File
@@ -74,5 +74,8 @@ function xmldb_auth_cas_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
auth/ldap/db/upgrade.php
+3
View File
@@ -64,5 +64,8 @@ function xmldb_auth_ldap_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
auth/manual/db/upgrade.php
+3
View File
@@ -56,5 +56,8 @@ function xmldb_auth_manual_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
auth/mnet/db/upgrade.php
+3
View File
@@ -56,5 +56,8 @@ function xmldb_auth_mnet_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
blocks/badges/db/upgrade.php
+3
View File
@@ -79,5 +79,8 @@ function xmldb_block_badges_upgrade($oldversion, $block) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
blocks/calendar_month/db/upgrade.php
+3
View File
@@ -79,5 +79,8 @@ function xmldb_block_calendar_month_upgrade($oldversion, $block) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
blocks/calendar_upcoming/db/upgrade.php
+3
View File
@@ -79,5 +79,8 @@ function xmldb_block_calendar_upcoming_upgrade($oldversion, $block) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
blocks/community/db/upgrade.php
+3
View File
@@ -69,5 +69,8 @@ function xmldb_block_community_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
blocks/completionstatus/db/upgrade.php
+3
View File
@@ -76,5 +76,8 @@ function xmldb_block_completionstatus_upgrade($oldversion, $block) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
blocks/course_summary/db/upgrade.php
+3
View File
@@ -80,5 +80,8 @@ function xmldb_block_course_summary_upgrade($oldversion, $block) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
blocks/html/db/upgrade.php
+3
View File
@@ -56,5 +56,8 @@ function xmldb_block_html_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
blocks/navigation/db/upgrade.php
+3
View File
@@ -81,5 +81,8 @@ function xmldb_block_navigation_upgrade($oldversion, $block) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
blocks/quiz_results/db/upgrade.php
+3
View File
@@ -104,5 +104,8 @@ function xmldb_block_quiz_results_upgrade($oldversion, $block) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
blocks/recent_activity/db/upgrade.php
+3
View File
@@ -90,5 +90,8 @@ function xmldb_block_recent_activity_upgrade($oldversion, $block) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
blocks/rss_client/db/upgrade.php
+3
View File
@@ -50,5 +50,8 @@ function xmldb_block_rss_client_upgrade($oldversion) {
upgrade_block_savepoint(true, 2015071700, 'rss_client');
}
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
blocks/section_links/db/upgrade.php
+3
View File
@@ -92,5 +92,8 @@ function xmldb_block_section_links_upgrade($oldversion, $block) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
blocks/selfcompletion/db/upgrade.php
+3
View File
@@ -80,5 +80,8 @@ function xmldb_block_selfcompletion_upgrade($oldversion, $block) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
blocks/settings/db/upgrade.php
+3
View File
@@ -81,5 +81,8 @@ function xmldb_block_settings_upgrade($oldversion, $block) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
enrol/database/db/upgrade.php
+3
View File
@@ -53,5 +53,8 @@ function xmldb_enrol_database_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
enrol/flatfile/db/upgrade.php
+3
View File
@@ -54,5 +54,8 @@ function xmldb_enrol_flatfile_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
enrol/guest/db/upgrade.php
+3
View File
@@ -63,6 +63,9 @@ function xmldb_enrol_guest_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
enrol/imsenterprise/db/upgrade.php
+3
View File
@@ -56,5 +56,8 @@ function xmldb_enrol_imsenterprise_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
enrol/manual/db/upgrade.php
+3
View File
@@ -72,6 +72,9 @@ function xmldb_enrol_manual_upgrade($oldversion) {
upgrade_plugin_savepoint(true, 2015091500, 'enrol', 'manual');
}
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
enrol/mnet/db/upgrade.php
+3
View File
@@ -55,5 +55,8 @@ function xmldb_enrol_mnet_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
enrol/paypal/db/upgrade.php
+3
View File
@@ -70,5 +70,8 @@ function xmldb_enrol_paypal_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
enrol/self/db/upgrade.php
+3
View File
@@ -71,6 +71,9 @@ function xmldb_enrol_self_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
filter/mathjaxloader/db/upgrade.php
+3
View File
@@ -109,5 +109,8 @@ MathJax.Hub.Config({
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
filter/mediaplugin/db/upgrade.php
+3
View File
@@ -78,5 +78,8 @@ function xmldb_filter_mediaplugin_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
filter/tex/db/upgrade.php
+3
View File
@@ -74,5 +74,8 @@ function xmldb_filter_tex_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
grade/grading/form/rubric/db/upgrade.php
+3
View File
@@ -62,5 +62,8 @@ function xmldb_gradingform_rubric_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
grade/report/overview/index.php
+1
View File
@@ -36,6 +36,7 @@ if (!$course = $DB->get_record('course', array('id' => $courseid))) {
print_error('nocourseid');
}
require_login(null, false);
$PAGE->set_course($course);
$context = context_course::instance($course->id);
$systemcontext = context_system::instance();
grade/report/user/db/upgrade.php
+3
View File
@@ -42,5 +42,8 @@ function xmldb_gradereport_user_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
lib/behat/classes/behat_selectors.php
+1 -1
View File
@@ -131,7 +131,7 @@ XPATH
[./descendant::*[self::h2][normalize-space(.) = %locator%] or %locator% = 'frontpage']
XPATH
, 'table' => <<<XPATH
.//table[(./@id = %locator% or contains(.//caption, %locator%) or contains(concat(' ', normalize-space(@class), ' '), %locator% ))]
.//table[(./@id = %locator% or contains(.//caption, %locator%) or contains(.//th, %locator%) or contains(concat(' ', normalize-space(@class), ' '), %locator% ))]
XPATH
, 'table_row' => <<<XPATH
.//tr[contains(normalize-space(.), %locator%) and not(.//tr[contains(normalize-space(.), %locator%)])]
lib/db/upgrade.php
+3
View File
@@ -4606,5 +4606,8 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2015100800.01);
}
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
lib/editor/atto/db/upgrade.php
+3
View File
@@ -102,5 +102,8 @@ function xmldb_editor_atto_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
lib/editor/atto/plugins/equation/db/upgrade.php
+3
View File
@@ -39,5 +39,8 @@ function xmldb_atto_equation_upgrade($oldversion) {
upgrade_plugin_savepoint(true, 2015083100, 'atto', 'equation');
}
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
lib/editor/tinymce/db/upgrade.php
+3
View File
@@ -184,5 +184,8 @@ fontselect,fontsizeselect,wrap,code,search,replace,wrap,nonbreaking,charmap,tabl
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
lib/editor/tinymce/plugins/spellchecker/db/upgrade.php
+3
View File
@@ -56,5 +56,8 @@ function xmldb_tinymce_spellchecker_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
message/output/email/db/upgrade.php
+3
View File
@@ -60,6 +60,9 @@ function xmldb_message_email_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
message/output/jabber/db/upgrade.php
+3
View File
@@ -60,6 +60,9 @@ function xmldb_message_jabber_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
message/output/popup/db/upgrade.php
+3
View File
@@ -60,6 +60,9 @@ function xmldb_message_popup_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/assign/db/upgrade.php
+3
View File
@@ -646,5 +646,8 @@ function xmldb_assign_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/assign/feedback/comments/db/upgrade.php
+3
View File
@@ -50,5 +50,8 @@ function xmldb_assignfeedback_comments_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/assign/feedback/editpdf/db/upgrade.php
+3
View File
@@ -76,5 +76,8 @@ function xmldb_assignfeedback_editpdf_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/assign/feedback/file/db/upgrade.php
+3
View File
@@ -50,5 +50,8 @@ function xmldb_assignfeedback_file_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/assign/submission/comments/db/upgrade.php
+3
View File
@@ -49,6 +49,9 @@ function xmldb_assignsubmission_comments_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/assign/submission/file/db/upgrade.php
+3
View File
@@ -47,6 +47,9 @@ function xmldb_assignsubmission_file_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/assign/submission/onlinetext/db/upgrade.php
+3
View File
@@ -49,6 +49,9 @@ function xmldb_assignsubmission_onlinetext_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/assignment/db/upgrade.php
+3
View File
@@ -128,6 +128,9 @@ function xmldb_assignment_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/book/db/upgrade.php
+3
View File
@@ -225,5 +225,8 @@ function xmldb_book_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/chat/db/upgrade.php
+3
View File
@@ -51,6 +51,9 @@ function xmldb_chat_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/chat/lib.php
+2 -2
View File
@@ -634,7 +634,7 @@ function chat_update_chat_times($chatid=0) {
$event = new stdClass(); // Update calendar too.
$cond = "modulename='chat' AND instance = :chatid AND timestart <> :chattime";
$params = array('chattime' => $chat->chattime, 'chatid' => $chatid);
$params = array('chattime' => $chat->chattime, 'chatid' => $chat->id);
if ($event->id = $DB->get_field_select('event', 'id', $cond, $params)) {
$event->timestart = $chat->chattime;
@@ -1265,7 +1265,7 @@ function chat_extend_settings_navigation(settings_navigation $settings, navigati
if ($chat->chattime && $chat->schedule) {
$nextsessionnode = $chatnode->add(get_string('nextsession', 'chat').
': '.userdate($chat->chattime).
' ('.usertimezone($USER->timezone));
' ('.usertimezone($USER->timezone).')');
$nextsessionnode->add_class('note');
}
mod/choice/db/upgrade.php
+3
View File
@@ -98,6 +98,9 @@ function xmldb_choice_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/data/db/upgrade.php
+3
View File
@@ -168,5 +168,8 @@ function xmldb_data_upgrade($oldversion) {
upgrade_mod_savepoint(true, 2015092200, 'data');
}
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/feedback/db/upgrade.php
+3
View File
@@ -67,6 +67,9 @@ function xmldb_feedback_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/folder/db/upgrade.php
+3
View File
@@ -125,5 +125,8 @@ function xmldb_folder_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/forum/db/upgrade.php
+3
View File
@@ -250,5 +250,8 @@ function xmldb_forum_upgrade($oldversion) {
upgrade_mod_savepoint(true, 2015102900, 'forum');
}
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/glossary/db/upgrade.php
+3
View File
@@ -83,6 +83,9 @@ function xmldb_glossary_upgrade($oldversion) {
upgrade_mod_savepoint(true, 2015060200, 'glossary');
}
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/imscp/db/upgrade.php
+3
View File
@@ -57,5 +57,8 @@ function xmldb_imscp_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/label/db/upgrade.php
+3
View File
@@ -93,6 +93,9 @@ function xmldb_label_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/lesson/db/upgrade.php
+4
View File
@@ -349,5 +349,9 @@ function xmldb_lesson_upgrade($oldversion) {
// Lesson savepoint reached.
upgrade_mod_savepoint(true, 2015071803, 'lesson');
}
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/lti/db/upgrade.php
+3
View File
@@ -194,6 +194,9 @@ function xmldb_lti_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/page/db/upgrade.php
+3
View File
@@ -78,5 +78,8 @@ function xmldb_page_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/quiz/db/upgrade.php
+3
View File
@@ -904,5 +904,8 @@ function xmldb_quiz_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/quiz/report/overview/db/upgrade.php
+3
View File
@@ -62,5 +62,8 @@ function xmldb_quiz_overview_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/quiz/report/statistics/db/upgrade.php
+3
View File
@@ -142,6 +142,9 @@ function xmldb_quiz_statistics_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/resource/db/upgrade.php
+3
View File
@@ -78,5 +78,8 @@ function xmldb_resource_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/scorm/db/upgrade.php
+3
View File
@@ -335,6 +335,9 @@ function xmldb_scorm_upgrade($oldversion) {
upgrade_mod_savepoint(true, 2015091400, 'scorm');
}
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/survey/db/upgrade.php
+3
View File
@@ -53,6 +53,9 @@ function xmldb_survey_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/url/db/upgrade.php
+3
View File
@@ -78,5 +78,8 @@ function xmldb_url_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/wiki/db/upgrade.php
+3
View File
@@ -90,5 +90,8 @@ function xmldb_wiki_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/workshop/db/upgrade.php
+3
View File
@@ -166,5 +166,8 @@ function xmldb_workshop_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/workshop/form/accumulative/db/upgrade.php
+3
View File
@@ -62,5 +62,8 @@ function xmldb_workshopform_accumulative_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/workshop/form/comments/db/upgrade.php
+3
View File
@@ -62,5 +62,8 @@ function xmldb_workshopform_comments_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/workshop/form/numerrors/db/upgrade.php
+3
View File
@@ -62,5 +62,8 @@ function xmldb_workshopform_numerrors_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
mod/workshop/form/rubric/db/upgrade.php
+3
View File
@@ -62,5 +62,8 @@ function xmldb_workshopform_rubric_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
portfolio/boxnet/db/upgrade.php
+3
View File
@@ -70,5 +70,8 @@ function xmldb_portfolio_boxnet_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
portfolio/googledocs/db/upgrade.php
+3
View File
@@ -64,5 +64,8 @@ function xmldb_portfolio_googledocs_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
portfolio/picasa/db/upgrade.php
+3
View File
@@ -64,5 +64,8 @@ function xmldb_portfolio_picasa_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
question/behaviour/manualgraded/db/upgrade.php
+3
View File
@@ -102,6 +102,9 @@ function xmldb_qbehaviour_manualgraded_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
question/type/calculated/db/upgrade.php
+3
View File
@@ -61,6 +61,9 @@ function xmldb_qtype_calculated_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
question/type/ddmarker/db/upgrade.php
+4
View File
@@ -58,5 +58,9 @@ function xmldb_qtype_ddmarker_upgrade($oldversion) {
// Savepoint reached.
upgrade_plugin_savepoint(true, 2013053000, 'qtype', 'ddmarker');
}
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
question/type/essay/db/upgrade.php
+3
View File
@@ -180,6 +180,9 @@ function xmldb_qtype_essay_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
question/type/match/db/upgrade.php
+3
View File
@@ -213,5 +213,8 @@ function xmldb_qtype_match_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
question/type/multianswer/db/upgrade.php
+3
View File
@@ -98,5 +98,8 @@ function xmldb_qtype_multianswer_upgrade($oldversion) {
upgrade_plugin_savepoint(true, 2015100201, 'qtype', 'multianswer');
}
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
question/type/multichoice/db/upgrade.php
+3
View File
@@ -145,5 +145,8 @@ function xmldb_qtype_multichoice_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
question/type/numerical/db/upgrade.php
+3
View File
@@ -58,5 +58,8 @@ function xmldb_qtype_numerical_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
question/type/random/db/upgrade.php
+3
View File
@@ -70,5 +70,8 @@ function xmldb_qtype_random_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
question/type/randomsamatch/db/upgrade.php
+3
View File
@@ -196,5 +196,8 @@ function xmldb_qtype_randomsamatch_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
question/type/shortanswer/db/upgrade.php
+3
View File
@@ -140,5 +140,8 @@ function xmldb_qtype_shortanswer_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
report/participation/index.php
+37 -24
View File
@@ -173,8 +173,15 @@ if (!empty($instanceid) && !empty($roleid)) {
$table = new flexible_table('course-participation-'.$course->id.'-'.$cm->id.'-'.$roleid);
$table->course = $course;
$table->define_columns(array('fullname','count','select'));
$table->define_headers(array(get_string('user'),((!empty($action)) ? get_string($action) : get_string('allactions')),get_string('select')));
$actionheader = !empty($action) ? get_string($action) : get_string('allactions');
if (empty($CFG->messaging)) {
$table->define_columns(array('fullname', 'count'));
$table->define_headers(array(get_string('user'), $actionheader));
} else {
$table->define_columns(array('fullname', 'count', 'select'));
$table->define_headers(array(get_string('user'), $actionheader, get_string('select')));
}
$table->define_baseurl($baseurl);
$table->set_attribute('cellpadding','5');
@@ -336,10 +343,14 @@ if (!empty($instanceid) && !empty($roleid)) {
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />'."\n";
foreach ($users as $u) {
$data = array('<a href="'.$CFG->wwwroot.'/user/view.php?id='.$u->userid.'&amp;course='.$course->id.'">'.fullname($u,true).'</a>'."\n",
((!empty($u->count)) ? get_string('yes').' ('.$u->count.') ' : get_string('no')),
'<input type="checkbox" class="usercheckbox" name="user'.$u->userid.'" value="'.$u->count.'" />'."\n",
);
$data = array();
$data[] = html_writer::link(new moodle_url('/user/view.php', array('id' => $u->userid, 'course' => $course->id)),
fullname($u, true));
$data[] = !empty($u->count) ? get_string('yes').' ('.$u->count.') ' : get_string('no');
if (!empty($CFG->messaging)) {
$data[] = '<input type="checkbox" class="usercheckbox" name="user'.$u->userid.'" value="'.$u->count.'" />';
}
$table->add_data($data);
}
@@ -357,25 +368,27 @@ if (!empty($instanceid) && !empty($roleid)) {
echo html_writer::end_div();
}
echo '<div class="selectbuttons">';
echo '<input type="button" id="checkall" value="'.get_string('selectall').'" /> '."\n";
echo '<input type="button" id="checknone" value="'.get_string('deselectall').'" /> '."\n";
if ($perpage >= $matchcount) {
echo '<input type="button" id="checknos" value="'.get_string('selectnos').'" />'."\n";
}
echo '</div>';
echo '<div>';
echo html_writer::label(get_string('withselectedusers'), 'formactionselect');
$displaylist['messageselect.php'] = get_string('messageselectadd');
echo html_writer::select($displaylist, 'formaction', '', array(''=>'choosedots'), array('id'=>'formactionselect'));
echo $OUTPUT->help_icon('withselectedusers');
echo '<input type="submit" value="' . get_string('ok') . '" />'."\n";
echo '</div>';
echo '</div>'."\n";
echo '</form>'."\n";
echo '</div>'."\n";
if (!empty($CFG->messaging)) {
echo '<div class="selectbuttons">';
echo '<input type="button" id="checkall" value="'.get_string('selectall').'" /> '."\n";
echo '<input type="button" id="checknone" value="'.get_string('deselectall').'" /> '."\n";
if ($perpage >= $matchcount) {
echo '<input type="button" id="checknos" value="'.get_string('selectnos').'" />'."\n";
}
echo '</div>';
echo '<div>';
echo html_writer::label(get_string('withselectedusers'), 'formactionselect');
$displaylist['messageselect.php'] = get_string('messageselectadd');
echo html_writer::select($displaylist, 'formaction', '', array('' => 'choosedots'), array('id' => 'formactionselect'));
echo $OUTPUT->help_icon('withselectedusers');
echo '<input type="submit" value="' . get_string('ok') . '" />'."\n";
echo '</div>';
echo '</div>'."\n";
echo '</form>'."\n";
echo '</div>'."\n";
$PAGE->requires->js_init_call('M.report_participation.init');
$PAGE->requires->js_init_call('M.report_participation.init');
}
}
echo $OUTPUT->footer();
report/participation/tests/behat/message_participants.feature
+69
View File
@@ -0,0 +1,69 @@
@report @report_participation @javascript
Feature: Use the particiaption report to message groups of students
In order to engage with students based on participation
As a teacher
I need to be able to message students who have not participated in an activity
Background:
Given the following "courses" exist:
| fullname | shortname | category | groupmode |
| Course 1 | C1 | 0 | 1 |
And the following "users" exist:
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@example.com |
| student1 | Student | 1 | student1@example.com |
| student2 | Student | 2 | student2@example.com |
| student3 | Student | 3 | student3@example.com |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
| student2 | C1 | student |
| student3 | C1 | student |
And I log in as "teacher1"
And I follow "Course 1"
And I turn editing mode on
And I add a "Book" to section "1" and I fill the form with:
| Name | Test book name |
| Description | Test book |
And I follow "Test book name"
And I set the following fields to these values:
| Chapter title | Test chapter |
| Content | Test chapter content |
And I log out
And I log in as "student1"
And I follow "Course 1"
And I follow "Test book name"
And I log out
Scenario: Message students who have not participated in book
Given I log in as "teacher1"
And I follow "Course 1"
And I navigate to "Course participation" node in "Course administration > Reports"
And I set the field "instanceid" to "Test book name"
And I set the field "roleid" to "Student"
And I press "Go"
And I should see "Yes (1)" in the "Student 1" "table_row"
And I should see "No" in the "Student 2" "table_row"
And I should see "No" in the "Student 3" "table_row"
When I press "Select all 'No'"
And I set the field "With selected users..." to "Send a message"
And I press "OK"
Then I should see "Added 2 new recipients"
And I should see "Student 2" in the "Currently selected users" "table"
And I should see "Student 3" in the "Currently selected users" "table"
And I should not see "Student 1" in the "Currently selected users" "table"
Scenario: Ensure no message options when messaging is disabled
Given I log in as "admin"
And I set the following administration settings values:
| messaging | 0 |
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I navigate to "Course participation" node in "Course administration > Reports"
When I set the field "instanceid" to "Test book name"
And I set the field "roleid" to "Student"
And I press "Go"
Then I should not see "With selected users..."
And I should not see "Select all"
repository/alfresco/db/upgrade.php
+3
View File
@@ -62,5 +62,8 @@ function xmldb_repository_alfresco_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
repository/boxnet/db/upgrade.php
+3
View File
@@ -83,5 +83,8 @@ function xmldb_repository_boxnet_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
repository/dropbox/db/upgrade.php
+3
View File
@@ -55,5 +55,8 @@ function xmldb_repository_dropbox_upgrade($oldversion) {
// Moodle v2.9.0 release upgrade line.
// Put any upgrade step following this.
// Moodle v3.0.0 release upgrade line.
// Put any upgrade step following this.
return true;
}

Some files were not shown because too many files have changed in this diff Show More