Merge branch 'MDL-79108-master' of https://github.com/sarjona/moodle

This commit is contained in:
Andrew Nicols 2023-09-01 11:55:59 +08:00
commit 34d5e85fb7
No known key found for this signature in database
GPG Key ID: 6D1E3157C8CFBF14
3 changed files with 10 additions and 3 deletions

View File

@ -99,6 +99,7 @@ class core_course_bulk_activity_completion_renderer extends plugin_renderer_base
$module->formhtml = $modform->render();
}
}
$data->issite = $course->id == SITEID;
return parent::render_from_template('core_course/defaultactivitycompletion', $data);
}

View File

@ -32,12 +32,17 @@
"string": "Manual",
"icon": "https://raw.githubusercontent.com/moodle/moodle/master/pix/i/completion-manual-enabled.png"
}
}]
}],
"issite": true
}
}}
<div class="container-fluid">
<div class="row my-5 defaultactivitycompletion-header">
<div class="col">{{#str}}defaultactivitycompletion, core_completion{{/str}}</div>
<div class="col">
{{#issite}}{{#str}}defaultactivitycompletionsite, core_completion{{/str}}{{/issite}}
{{^issite}}{{#str}}defaultactivitycompletioncourse, core_completion{{/str}}{{/issite}}
</div>
</div>
<div class="modules pt-3">

View File

@ -143,7 +143,8 @@ $string['datepassed'] = 'Date passed';
$string['days'] = 'Days';
$string['daysoftotal'] = '{$a->days} of {$a->total}';
$string['daysuntilcompletion'] = 'Days until completion';
$string['defaultactivitycompletion'] = 'These are the default completion conditions for activities in all courses.';
$string['defaultactivitycompletionsite'] = 'These are the default completion conditions for activities in all courses.';
$string['defaultactivitycompletioncourse'] = 'These are the default completion conditions for activities in this course.';
$string['defaultcompletion'] = 'Default activity completion';
$string['defaultcompletionupdated'] = 'Changes saved';
$string['deletecompletiondata'] = 'Delete completion data';