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

Merge branch 'MDL-49611' of git://github.com/srynot4sale/moodle-fixes

Browse Source
This commit is contained in:
David Monllao
2015-05-27 08:49:23 +08:00
parent 777cb3ece8 03f3f7180f
commit 1bd2c8ad01
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/completionstatus/details.php
+1 -1
View File
@@ -133,7 +133,7 @@ if (empty($completions)) {
echo html_writer::start_tag('tr');
echo html_writer::start_tag('td', array('colspan' => '2'));
echo html_writer::start_tag('br');
echo $OUTPUT->box(get_string('err_nocriteria', 'completion'), 'noticebox');
echo $OUTPUT->box(get_string('nocriteriaset', 'completion'), 'noticebox');
echo html_writer::end_tag('td');
echo html_writer::end_tag('tr');
echo html_writer::end_tag('tbody');
completion/classes/external.php
+1 -1
View File
@@ -301,7 +301,7 @@ class core_completion_external extends external_api {
$completions = $info->get_completions($user->id);
if (empty($completions)) {
throw new moodle_exception('err_nocriteria', 'completion');
throw new moodle_exception('nocriteriaset', 'completion');
}
// Load course completion.
report/completion/index.php
+1 -1
View File
@@ -91,7 +91,7 @@ $modinfo = get_fast_modinfo($course);
$completion = new completion_info($course);
if (!$completion->has_criteria()) {
print_error('err_nocriteria', 'completion', $CFG->wwwroot.'/course/report.php?id='.$course->id);
print_error('nocriteriaset', 'completion', $CFG->wwwroot.'/course/report.php?id='.$course->id);
}
// Get criteria and put in correct order