mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 00:20:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-78435-401' of https://github.com/paulholden/moodle into MOODLE_401_STABLE

Browse Source
This commit is contained in:
Andrew Nicols 2023-06-22 00:07:16 +08:00 committed by Sara Arjona
commit 0e3c4ad99b
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mod/assign/lang/en/assign.php
View File

@ -175,6 +175,7 @@ $string['submissionempty'] = 'Nothing was submitted';
$string['submissionmodified'] = 'You have existing submission data. Please leave this page and try again.';
$string['submissionmodifiedgroup'] = 'The submission has been modified by somebody else. Please leave this page and try again.';
$string['duedatereached'] = 'The due date for this assignment has now passed';
$string['duedateaftersubmissionvalidation'] = 'Due date must be after the allow submissions from date.';
$string['duedatevalidation'] = 'Due date cannot be earlier than the allow submissions from date.';
$string['editattemptfeedback'] = 'Edit the grade and feedback for attempt number {$a}.';
$string['editonline'] = 'Edit online';

4
mod/assign/mod_form.php
View File

@ -247,8 +247,8 @@ class mod_assign_mod_form extends moodleform_mod {
$errors = parent::validation($data, $files);
if (!empty($data['allowsubmissionsfromdate']) && !empty($data['duedate'])) {
if ($data['duedate'] < $data['allowsubmissionsfromdate']) {
$errors['duedate'] = get_string('duedatevalidation', 'assign');
if ($data['duedate'] <= $data['allowsubmissionsfromdate']) {
$errors['duedate'] = get_string('duedateaftersubmissionvalidation', 'assign');
}
}
if (!empty($data['cutoffdate']) && !empty($data['duedate'])) {

4
mod/assign/override_form.php
View File

@ -324,8 +324,8 @@ class assign_override_form extends moodleform {
}
if (!empty($data['allowsubmissionsfromdate']) && !empty($data['duedate'])) {
if ($data['duedate'] < $data['allowsubmissionsfromdate']) {
$errors['duedate'] = get_string('duedatevalidation', 'assign');
if ($data['duedate'] <= $data['allowsubmissionsfromdate']) {
$errors['duedate'] = get_string('duedateaftersubmissionvalidation', 'assign');
}
}