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

This commit is contained in:
Shamim Rezaie 2023-07-17 20:36:00 +10:00
commit d0bef0b899
2 changed files with 22 additions and 1 deletions

View File

@ -6785,7 +6785,15 @@ class assign {
return false;
}
if ($instance->requiresubmissionstatement && empty($data->submissionstatement) && $USER->id == $userid) {
$adminconfig = $this->get_admin_config();
$submissionstatement = '';
if ($instance->requiresubmissionstatement) {
$submissionstatement = $this->get_submissionstatement($adminconfig, $instance, $this->context);
}
if (!empty($submissionstatement) && $instance->requiresubmissionstatement
&& empty($data->submissionstatement) && $USER->id == $userid) {
return false;
}

View File

@ -39,6 +39,19 @@ Feature: In an assignment, teacher can require submission statements
And I press "Continue"
And I should see "Submitted for grading" in the "Submission status" "table_row"
Scenario: Student is not required to accept assignment submission statement when non exists
Given the following config values are set as admin:
| config | value | plugin |
| submissionstatement | | assign |
And I am on the "Test assign" "assign activity" page logged in as student1
When I press "Add submission"
And I set the field "Online text" to "My submission text."
And I press "Save changes"
And I should see "Draft (not submitted)" in the "Submission status" "table_row"
And I press "Submit assignment"
And I press "Continue"
Then I should see "Submitted for grading" in the "Submission status" "table_row"
Scenario: Student is not required to accept assignment submission statement
Given I am on the "Test assign" "assign activity editing" page logged in as teacher1
And I set the following fields to these values: