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

MDL-38655: mod_assign: Use correct ordering on cap checks for submission downloads

Browse Source 
Conflicts:
	mod/assign/locallib.php
This commit is contained in:
Adam Olley
2013-10-04 09:32:52 +09:30
parent c777836c69
commit 635216b08b
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/locallib.php
+4 -7
View File
@@ -3086,12 +3086,12 @@ class assign {
public function can_view_group_submission($groupid) {
global $USER;
if (!is_enrolled($this->get_course_context(), $USER->id)) {
return false;
}
if (has_capability('mod/assign:grade', $this->context)) {
return true;
}
if (!is_enrolled($this->get_course_context(), $USER->id)) {
return false;
}
$members = $this->get_submission_group_members($groupid, true);
foreach ($members as $member) {
if ($member->id == $USER->id) {
@@ -3110,7 +3110,7 @@ class assign {
public function can_view_submission($userid) {
global $USER;
if (is_siteadmin()) {
if (has_capability('mod/assign:grade', $this->context)) {
return true;
}
if (!is_enrolled($this->get_course_context(), $userid)) {
@@ -3119,9 +3119,6 @@ class assign {
if ($userid == $USER->id && has_capability('mod/assign:submit', $this->context)) {
return true;
}
if (has_capability('mod/assign:grade', $this->context)) {
return true;
}
return false;
}