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

Merge branch 'MDL-78984' of https://github.com/paulholden/moodle

Browse Source
This commit is contained in:
Huong Nguyen
2024-02-27 09:53:12 +07:00
parent 34304b33f9 7cf9fac457
commit a781283002
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/classes/output/user_submission_actionmenu.php
+2 -1
View File
@@ -131,7 +131,8 @@ class user_submission_actionmenu implements templatable, renderable {
}
if ($status === ASSIGN_SUBMISSION_STATUS_NEW) {
if ($this->timelimit && empty($this->submission->timestarted)) {
$timelimitenabled = get_config('assign', 'enabletimelimit');
if ($timelimitenabled && $this->timelimit && empty($this->submission->timestarted)) {
$confirmation = new \confirm_action(
get_string('confirmstart', 'assign', format_time($this->timelimit)),
null,
mod/assign/override_form.php
+7 -4
View File
@@ -263,9 +263,12 @@ class assign_override_form extends moodleform {
}
// Time limit.
$mform->addElement('duration', 'timelimit',
get_string('timelimit', 'assign'), array('optional' => true));
$mform->setDefault('timelimit', $assigninstance->timelimit);
$timelimitenabled = get_config('assign', 'enabletimelimit');
if ($timelimitenabled) {
$mform->addElement('duration', 'timelimit',
get_string('timelimit', 'assign'), array('optional' => true));
$mform->setDefault('timelimit', $assigninstance->timelimit);
}
// Submit buttons.
$mform->addElement('submit', 'resetbutton',
@@ -344,7 +347,7 @@ class assign_override_form extends moodleform {
$changed = false;
$keys = array('duedate', 'cutoffdate', 'allowsubmissionsfromdate', 'timelimit');
foreach ($keys as $key) {
if ($data[$key] != $assigninstance->{$key}) {
if (isset($data[$key]) && $data[$key] != $assigninstance->{$key}) {
$changed = true;
break;
}
mod/assign/overrideedit.php
+1 -1
View File
@@ -144,7 +144,7 @@ if ($mform->is_cancelled()) {
// Replace unchanged values with null.
foreach ($keys as $key) {
if (($fromform->{$key} == $assigninstance->{$key})) {
if (!isset($fromform->{$key}) || $fromform->{$key} == $assigninstance->{$key}) {
$fromform->{$key} = null;
}
}
mod/assign/overrides.php
+2 -1
View File
@@ -211,7 +211,8 @@ foreach ($overrides as $override) {
}
// Format timelimit.
if (isset($override->timelimit)) {
$timelimitenabled = get_config('assign', 'enabletimelimit');
if ($timelimitenabled && isset($override->timelimit)) {
$fields[] = get_string('timelimit', 'assign');
$values[] = $override->timelimit > 0 ? format_time($override->timelimit) : get_string('none', 'assign');
}