1
0
mirror of https://github.com/moodle/moodle.git synced 2025-04-24 18:04:43 +02:00

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

This commit is contained in:
David Monllao 2017-03-20 05:13:10 +01:00
commit 050d8e84cd

@ -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