From: skodak <skodak>
Date: Sun, 17 Feb 2008 14:56:30 +0000 (+0000)
Subject: MDL-13437 Grader report: Showing idnumber column shifts controls into wrong columns... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=322a5f6301cc364a7a3f0cc7000a857e583e224b;p=moodle.git

MDL-13437 Grader report: Showing idnumber column shifts controls into wrong columns; merged from MOODLE_19_STABLE
---

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 3d3bc0fc08..26f8ee9199 100644
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -1128,10 +1128,15 @@ class grade_report_grader extends grade_report {
         global $USER;
 
         $iconshtml = '';
-            if ($USER->gradeediting[$this->courseid]) {
+        if ($USER->gradeediting[$this->courseid]) {
+
+            $colspan='';
+            if ($this->get_pref('showuseridnumber')) {
+                $colspan = 'colspan="2" ';
+            }
 
             $iconshtml = '<tr class="r'.$this->rowcount++.'">'
-                       . '<th class="header c0 range" scope="row">'.$this->get_lang_string('controls','grades').'</th>';
+                       . '<th class="header c0 range" scope="row" '.$colspan.'>'.$this->get_lang_string('controls','grades').'</th>';
 
             $columncount = 1;
             foreach ($this->gtree->items as $itemid=>$unused) {