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

Merge branch 'wip-MDL-58731-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2017-04-28 10:29:50 +08:00
parent baf3d04954 438c01d0dd
commit e6c0e75ed8
9 changed files with 54 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/choice/lib.php
+6 -1
View File
@@ -1247,7 +1247,7 @@ function choice_get_coursemodule_info($coursemodule) {
global $DB;
$dbparams = ['id' => $coursemodule->instance];
$fields = 'id, name, completionsubmit';
$fields = 'id, name, intro, introformat, completionsubmit';
if (!$choice = $DB->get_record('choice', $dbparams, $fields)) {
return false;
}
@@ -1255,6 +1255,11 @@ function choice_get_coursemodule_info($coursemodule) {
$result = new cached_cm_info();
$result->name = $choice->name;
if ($coursemodule->showdescription) {
// Convert intro to html. Do not filter cached version, filters run at display time.
$result->content = format_module_intro('choice', $choice, $coursemodule->id, false);
}
// Populate the custom completion rules as key => value pairs, but only if the completion mode is 'automatic'.
if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {
$result->customdata['customcompletionrules']['completionsubmit'] = $choice->completionsubmit;
mod/data/lib.php
+6 -1
View File
@@ -4336,7 +4336,7 @@ function data_get_coursemodule_info($coursemodule) {
global $DB;
$dbparams = ['id' => $coursemodule->instance];
$fields = 'id, name, completionentries';
$fields = 'id, name, intro, introformat, completionentries';
if (!$data = $DB->get_record('data', $dbparams, $fields)) {
return false;
}
@@ -4344,6 +4344,11 @@ function data_get_coursemodule_info($coursemodule) {
$result = new cached_cm_info();
$result->name = $data->name;
if ($coursemodule->showdescription) {
// Convert intro to html. Do not filter cached version, filters run at display time.
$result->content = format_module_intro('data', $data, $coursemodule->id, false);
}
// Populate the custom completion rules as key => value pairs, but only if the completion mode is 'automatic'.
if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {
$result->customdata['customcompletionrules']['completionentries'] = $data->completionentries;
mod/feedback/lib.php
+6 -1
View File
@@ -3492,7 +3492,7 @@ function feedback_get_coursemodule_info($coursemodule) {
global $DB;
$dbparams = ['id' => $coursemodule->instance];
$fields = 'id, name, completionsubmit';
$fields = 'id, name, intro, introformat, completionsubmit';
if (!$feedback = $DB->get_record('feedback', $dbparams, $fields)) {
return false;
}
@@ -3500,6 +3500,11 @@ function feedback_get_coursemodule_info($coursemodule) {
$result = new cached_cm_info();
$result->name = $feedback->name;
if ($coursemodule->showdescription) {
// Convert intro to html. Do not filter cached version, filters run at display time.
$result->content = format_module_intro('feedback', $feedback, $coursemodule->id, false);
}
// Populate the custom completion rules as key => value pairs, but only if the completion mode is 'automatic'.
if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {
$result->customdata['customcompletionrules']['completionsubmit'] = $feedback->completionsubmit;
mod/forum/lib.php
+6 -1
View File
@@ -8244,7 +8244,7 @@ function forum_get_coursemodule_info($coursemodule) {
global $DB;
$dbparams = ['id' => $coursemodule->instance];
$fields = 'id, name, completionposts, completiondiscussions, completionreplies';
$fields = 'id, name, intro, introformat, completionposts, completiondiscussions, completionreplies';
if (!$forum = $DB->get_record('forum', $dbparams, $fields)) {
return false;
}
@@ -8252,6 +8252,11 @@ function forum_get_coursemodule_info($coursemodule) {
$result = new cached_cm_info();
$result->name = $forum->name;
if ($coursemodule->showdescription) {
// Convert intro to html. Do not filter cached version, filters run at display time.
$result->content = format_module_intro('forum', $forum, $coursemodule->id, false);
}
// Populate the custom completion rules as key => value pairs, but only if the completion mode is 'automatic'.
if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {
$result->customdata['customcompletionrules']['completiondiscussions'] = $forum->completiondiscussions;
mod/glossary/lib.php
+6 -1
View File
@@ -4220,7 +4220,7 @@ function glossary_get_coursemodule_info($coursemodule) {
global $DB;
$dbparams = ['id' => $coursemodule->instance];
$fields = 'id, name, completionentries';
$fields = 'id, name, intro, introformat, completionentries';
if (!$glossary = $DB->get_record('glossary', $dbparams, $fields)) {
return false;
}
@@ -4228,6 +4228,11 @@ function glossary_get_coursemodule_info($coursemodule) {
$result = new cached_cm_info();
$result->name = $glossary->name;
if ($coursemodule->showdescription) {
// Convert intro to html. Do not filter cached version, filters run at display time.
$result->content = format_module_intro('glossary', $glossary, $coursemodule->id, false);
}
// Populate the custom completion rules as key => value pairs, but only if the completion mode is 'automatic'.
if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {
$result->customdata['customcompletionrules']['completionentries'] = $glossary->completionentries;
mod/lesson/lib.php
+6 -1
View File
@@ -1665,7 +1665,7 @@ function lesson_get_coursemodule_info($coursemodule) {
global $DB;
$dbparams = ['id' => $coursemodule->instance];
$fields = 'id, name, completionendreached, completiontimespent';
$fields = 'id, name, intro, introformat, completionendreached, completiontimespent';
if (!$lesson = $DB->get_record('lesson', $dbparams, $fields)) {
return false;
}
@@ -1673,6 +1673,11 @@ function lesson_get_coursemodule_info($coursemodule) {
$result = new cached_cm_info();
$result->name = $lesson->name;
if ($coursemodule->showdescription) {
// Convert intro to html. Do not filter cached version, filters run at display time.
$result->content = format_module_intro('lesson', $lesson, $coursemodule->id, false);
}
// Populate the custom completion rules as key => value pairs, but only if the completion mode is 'automatic'.
if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {
$result->customdata['customcompletionrules']['completionendreached'] = $lesson->completionendreached;
mod/quiz/lib.php
+6 -1
View File
@@ -2178,7 +2178,7 @@ function quiz_get_coursemodule_info($coursemodule) {
global $DB;
$dbparams = ['id' => $coursemodule->instance];
$fields = 'id, name, completionattemptsexhausted, completionpass';
$fields = 'id, name, intro, introformat, completionattemptsexhausted, completionpass';
if (!$quiz = $DB->get_record('quiz', $dbparams, $fields)) {
return false;
}
@@ -2186,6 +2186,11 @@ function quiz_get_coursemodule_info($coursemodule) {
$result = new cached_cm_info();
$result->name = $quiz->name;
if ($coursemodule->showdescription) {
// Convert intro to html. Do not filter cached version, filters run at display time.
$result->content = format_module_intro('quiz', $quiz, $coursemodule->id, false);
}
// Populate the custom completion rules as key => value pairs, but only if the completion mode is 'automatic'.
if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {
$result->customdata['customcompletionrules']['completionattemptsexhausted'] = $quiz->completionattemptsexhausted;
mod/scorm/lib.php
+6 -1
View File
@@ -1660,7 +1660,7 @@ function scorm_get_coursemodule_info($coursemodule) {
global $DB;
$dbparams = ['id' => $coursemodule->instance];
$fields = 'id, name, completionstatusrequired, completionscorerequired, completionstatusallscos';
$fields = 'id, name, intro, introformat, completionstatusrequired, completionscorerequired, completionstatusallscos';
if (!$scorm = $DB->get_record('scorm', $dbparams, $fields)) {
return false;
}
@@ -1668,6 +1668,11 @@ function scorm_get_coursemodule_info($coursemodule) {
$result = new cached_cm_info();
$result->name = $scorm->name;
if ($coursemodule->showdescription) {
// Convert intro to html. Do not filter cached version, filters run at display time.
$result->content = format_module_intro('scorm', $scorm, $coursemodule->id, false);
}
// Populate the custom completion rules as key => value pairs, but only if the completion mode is 'automatic'.
if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {
$result->customdata['customcompletionrules']['completionstatusrequired'] = $scorm->completionstatusrequired;
mod/survey/lib.php
+6 -1
View File
@@ -1161,7 +1161,7 @@ function survey_get_coursemodule_info($coursemodule) {
global $DB;
$dbparams = ['id' => $coursemodule->instance];
$fields = 'id, name, completionsubmit';
$fields = 'id, name, intro, introformat, completionsubmit';
if (!$survey = $DB->get_record('survey', $dbparams, $fields)) {
return false;
}
@@ -1169,6 +1169,11 @@ function survey_get_coursemodule_info($coursemodule) {
$result = new cached_cm_info();
$result->name = $survey->name;
if ($coursemodule->showdescription) {
// Convert intro to html. Do not filter cached version, filters run at display time.
$result->content = format_module_intro('survey', $survey, $coursemodule->id, false);
}
// Populate the custom completion rules as key => value pairs, but only if the completion mode is 'automatic'.
if ($coursemodule->completion == COMPLETION_TRACKING_AUTOMATIC) {
$result->customdata['customcompletionrules']['completionsubmit'] = $survey->completionsubmit;