Merge branch 'WIP-MDL-35249-master' of git://github.com/nadavkav/moodle

Conflicts:
	mod/assign/gradingtable.php

diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php
index e2a78fb..53291dc 100644 (file)
--- a/mod/assign/gradingtable.php
+++ b/mod/assign/gradingtable.php
@@ -160,10 +160,6 @@ class assign_grading_table extends table_sql implements renderable {
             $headers[] = get_string('select') .
                     '<div class="selectall"><label class="accesshide" for="selectall">' . get_string('selectall') . '</label>
                     <input type="checkbox" id="selectall" name="selectall" title="' . get_string('selectall') . '"/></div>';
-
-            // We have to call this column userid so we can use userid as a default sortable column.
-            $columns[] = 'userid';
-            $headers[] = get_string('edit');
         }
 
         // User picture.
@@ -213,6 +209,11 @@ class assign_grading_table extends table_sql implements renderable {
                 $headers[] = get_string('scale', 'assign');
             }
         }
+        if (!$this->is_downloading()) {
+            // We have to call this column userid so we can use userid as a default sortable column.
+            $columns[] = 'userid';
+            $headers[] = get_string('edit');
+        }
 
         // Submission plugins
         if ($assignment->is_any_submission_plugin_enabled()) {