MDL-14216 "Improvements to regrade report - improved reporting of actions and dry...

diff --git a/mod/quiz/report/overview/overview_table.php b/mod/quiz/report/overview/overview_table.php
index 68d17253adbe0a482b484a0bc534b434694ca3e4..c58bc1af27e64992c6b43c2e15ffb14d97bd86f5 100644 (file)
--- a/mod/quiz/report/overview/overview_table.php
+++ b/mod/quiz/report/overview/overview_table.php
@@ -92,7 +92,9 @@ class quiz_report_overview_table extends table_sql {
                 echo '<a href="javascript:deselect_all_in(\'DIV\',null,\'tablecontainer\');">'.
                         get_string('selectnone', 'quiz').'</a> ';
                 echo '&nbsp;&nbsp;';
-                echo '<input type="submit" name="regrade" value="'.get_string('regradeselected', 'quiz_overview').'"/>';
+                if (has_capability('mod/quiz:grade', $this->context)){
+                    echo '<input type="submit" name="regrade" value="'.get_string('regradeselected', 'quiz_overview').'"/>';
+                }
                 echo '<input type="submit" onclick="return confirm(\''.$strreallydel.'\');" name="delete" value="'.get_string('deleteselected', 'quiz_overview').'"/>';
                 echo '</div>';
                 // Close form

diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php
index 972a82f122024ccffd68a418aaa079278ed5e398..83110926bd9d33114319384907fd4db01f89368a 100644 (file)
--- a/mod/quiz/report/overview/report.php
+++ b/mod/quiz/report/overview/report.php
@@ -214,19 +214,20 @@ class quiz_overview_report extends quiz_default_report {
             $regradealllabel = get_string('regradeall', 'quiz_overview');
         }
         
-        
-        echo '<div class="mdl-align">';
-        echo '<form action="'.$reporturl->out(true).'">';
-        echo '<div>';
-        echo $reporturl->hidden_params_out(array(), 0, $displayoptions);
-        echo '<input type="submit" name="regradeall" value="'.$regradealllabel.'"/>';
-        echo '<input type="submit" name="regradealldry" value="'.$regradealldrylabel.'"/>';
-        if ($countregradeneeded){
-            echo '<input type="submit" name="regradealldrydo" value="'.$regradealldrydolabel.'"/>';
-        }
-        echo '</div>';
-        echo '</form>';
-        echo '</div>';
+        if (has_capability('mod/quiz:grade', $this->context)){
+            echo '<div class="mdl-align">';
+            echo '<form action="'.$reporturl->out(true).'">';
+            echo '<div>';
+            echo $reporturl->hidden_params_out(array(), 0, $displayoptions);
+            echo '<input type="submit" name="regradeall" value="'.$regradealllabel.'"/>';
+            echo '<input type="submit" name="regradealldry" value="'.$regradealldrylabel.'"/>';
+            if ($countregradeneeded){
+                echo '<input type="submit" name="regradealldrydo" value="'.$regradealldrydolabel.'"/>';
+            }
+            echo '</div>';
+            echo '</form>';
+            echo '</div>';
+        }
 
         if (!$nostudents || ($attemptsmode == QUIZ_REPORT_ATTEMPTS_ALL)){
             // Print information on the grading method and whether we are displaying