From 330f45b6e2fd99e682f1df33d013bbca0d4d513d Mon Sep 17 00:00:00 2001
From: Eric Merrill <merrill@oakland.edu>
Date: Tue, 14 Mar 2017 15:09:27 -0400
Subject: [PATCH] MDL-58262 assign: Use unique sql parameter

---
 mod/assign/gradingtable.php                   | 16 ++++++++--------
 .../tests/behat/steps_blind_marking.feature   | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php
index 0d605c31606..04625b6bceb 100644
--- a/mod/assign/gradingtable.php
+++ b/mod/assign/gradingtable.php
@@ -131,12 +131,6 @@ class assign_grading_table extends table_sql implements renderable {
         $params['assignmentid2'] = (int)$this->assignment->get_instance()->id;
         $params['assignmentid3'] = (int)$this->assignment->get_instance()->id;
 
-        $params['assignmentid5'] = (int)$this->assignment->get_instance()->id;
-        $params['assignmentid6'] = (int)$this->assignment->get_instance()->id;
-        $params['assignmentid7'] = (int)$this->assignment->get_instance()->id;
-        $params['assignmentid8'] = (int)$this->assignment->get_instance()->id;
-        $params['assignmentid9'] = (int)$this->assignment->get_instance()->id;
-
         $extrauserfields = get_extra_user_fields($this->assignment->get_context());
 
         $fields = user_picture::fields('u', $extrauserfields) . ', ';
@@ -187,6 +181,12 @@ class assign_grading_table extends table_sql implements renderable {
         $hasoverrides = $this->assignment->has_overrides();
 
         if ($hasoverrides) {
+            $params['assignmentid5'] = (int)$this->assignment->get_instance()->id;
+            $params['assignmentid6'] = (int)$this->assignment->get_instance()->id;
+            $params['assignmentid7'] = (int)$this->assignment->get_instance()->id;
+            $params['assignmentid8'] = (int)$this->assignment->get_instance()->id;
+            $params['assignmentid9'] = (int)$this->assignment->get_instance()->id;
+
             $fields .= ', priority.priority, ';
             $fields .= 'effective.allowsubmissionsfromdate, ';
             $fields .= 'effective.duedate, ';
@@ -252,8 +252,8 @@ class assign_grading_table extends table_sql implements renderable {
         if (!empty($this->assignment->get_instance()->blindmarking)) {
             $from .= 'LEFT JOIN {assign_user_mapping} um
                              ON u.id = um.userid
-                            AND um.assignment = :assignmentid5 ';
-            $params['assignmentid5'] = (int)$this->assignment->get_instance()->id;
+                            AND um.assignment = :assignmentidblind ';
+            $params['assignmentidblind'] = (int)$this->assignment->get_instance()->id;
             $fields .= ', um.id as recordid ';
         }
 
diff --git a/mod/assign/tests/behat/steps_blind_marking.feature b/mod/assign/tests/behat/steps_blind_marking.feature
index 3134036ba74..c37c43f4fd2 100644
--- a/mod/assign/tests/behat/steps_blind_marking.feature
+++ b/mod/assign/tests/behat/steps_blind_marking.feature
@@ -113,3 +113,22 @@ Feature: Assignments correctly add feedback to the grade report when workflow an
     And I navigate to "User report" in the course gradebook
     Then I should see "50"
     And I should see "Great job! Lol, not really."
+
+  @javascript
+  Scenario: Submissions table visible with overrides and blind marking
+    When I follow "Test assignment name"
+    And I navigate to "User overrides" in current page administration
+    And I press "Add user override"
+    And I set the following fields to these values:
+      | Override user      | Student |
+      | id_duedate_enabled | 1 |
+      | duedate[day]       | 1 |
+      | duedate[month]     | January |
+      | duedate[year]      | 2020 |
+      | duedate[hour]      | 08 |
+      | duedate[minute]    | 00 |
+    And I press "Save"
+    And I should see "Wednesday, 1 January 2020, 8:00"
+    And I follow "Test assignment name"
+    And I navigate to "View all submissions" in current page administration
+    And I should see "In review" in the "I'm the student's first submission" "table_row"