Merge branch 'MDL-45940-master' of git://github.com/damyon/moodle

2014-06-16 17:28:15 +08:00
parent c126413655 de06ce7ed3
commit db8071a7f9
1 changed files with 2 additions and 3 deletions
@@ -3685,10 +3685,9 @@ class assign {
        }

        if ($this->can_view_submission($user->id)) {
-            $showedit = has_capability('mod/assign:submit', $this->context) &&
-                        $this->submissions_open($user->id) &&
+            $showedit = $showlinks &&
                        ($this->is_any_submission_plugin_enabled()) &&
-                        $showlinks;
+                        $this->can_edit_submission($user->id);

            $gradelocked = ($flags && $flags->locked) || $this->grading_disabled($user->id, false);