Merge branch 'MDL-58166-m' of git://github.com/pavelsokolov/moodle

2017-03-20 05:13:10 +01:00
parent eaf3bcfecd bfca67f045
commit 050d8e84cd
1 changed files with 2 additions and 1 deletions
@@ -1840,7 +1840,8 @@ class assign {

            if ($instance->markingworkflow &&
                    $instance->markingallocation &&
-                    !has_capability('mod/assign:manageallocations', $this->get_context())) {
+                    !has_capability('mod/assign:manageallocations', $this->get_context()) &&
+                    has_capability('mod/assign:grade', $this->get_context())) {

                $additionaljoins .= ' LEFT JOIN {assign_user_flags} uf
                                     ON u.id = uf.userid