mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-59195_assign_comment_permissions' of git://github.com/davosmith/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2017-08-29 11:54:07 +01:00
commit 08220d64f6
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mod/assign/submission/comments/lib.php
View File

@ -48,15 +48,6 @@ function assignsubmission_comments_comment_validate(stdClass $options) {
if ($assignment->get_instance()->id != $submission->assignment) {
throw new comment_exception('invalidcontext');
}
$canview = false;
if ($submission->userid) {
$canview = $assignment->can_view_submission($submission->userid);
} else {
$canview = $assignment->can_view_group_submission($submission->groupid);
}
if (!$canview) {
throw new comment_exception('nopermissiontocomment');
}
return true;
}

1
mod/assign/submission/comments/locallib.php
View File

@ -69,7 +69,6 @@ class assign_submission_comments extends assign_submission_plugin {
$options->displaycancel = true;
$comment = new comment($options);
$comment->set_view_permission(true);
$o = $this->assignment->get_renderer()->container($comment->output(true), 'commentscontainer');
return $o;

26
mod/assign/tests/behat/assign_comments_no_error.feature Normal file
View File

@ -0,0 +1,26 @@
@mod @mod_assign
Feature: Switch role does not cause an error message in assignsubmission_comments
Background:
Given the following "courses" exist:
| fullname | shortname |
| Course 1 | C1 |
And the following "users" exist:
| username |
| teacher1 |
And the following "course enrolments" exist:
| course | user | role |
| C1 | teacher1 | editingteacher |
And I log in as "teacher1"
And I am on "Course 1" course homepage
And I turn editing mode on
And I add a "Assignment" to section "1" and I fill the form with:
| Assignment name | Test assignment |
| Description | This is the description text |
| Students submit in groups | Yes |
Scenario: I switch role to student and an error doesn't occur
When I follow "Switch role to..." in the user menu
And I press "Student"
And I follow "Test assignment"
Then I should see "This is the description text"