MDL-11282 Just displaying a simple notice, and continuing with the regrading.

diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php
index 9c9242e760679fad60604b4f8201cfda3cdf3aaa..dcc712846616a8aa19166b16c522a31ef0dc5c56 100644 (file)
--- a/lang/en_utf8/grades.php
+++ b/lang/en_utf8/grades.php
@@ -163,7 +163,7 @@ $string['gradeexceptions'] = 'Grade Exceptions';
 $string['gradeexceptionshelp'] = 'Grade Exceptions Help';
 $string['gradehelp'] = 'Grade Help';
 $string['gradeitem'] = 'Grade item';
-$string['gradeitemislocked'] = 'This activity is locked in the gradebook. If you regrade it, the grades held internally by this activity will be different from the ones in the gradebook, the latter which will remain unchanged. Are you sure you want to proceed with the regrading?';
+$string['gradeitemislocked'] = 'This activity is locked in the gradebook. Changes that are made to grades in this activity will not be copied to the gradebook until it is unlocked.';
 $string['gradeitemlocked'] = 'Grading locked';
 $string['gradeitemsinc'] = 'Grade items to be included';
 $string['gradeitemaddusers'] = 'Exclude from Grading';

diff --git a/lib/gradelib.php b/lib/gradelib.php
index 16ac00de70423b75ce7fa097655a5965d5db5b13..ac43d3cd3d5bb230d3dc053b457eca136e4e03ea 100644 (file)
--- a/lib/gradelib.php
+++ b/lib/gradelib.php
@@ -128,14 +128,9 @@ function grade_update($source, $courseid, $itemtype, $itemmodule, $iteminstance,
 
     } else {
         if ($grade_item->is_locked()) {
-            $confirm_regrade = optional_param('confirm_regrade', 0, PARAM_INT);
-            if (!$confirm_regrade) {
-                $message = get_string('gradeitemislocked', 'grades', $grade_item->itemname);
-                $back_link = '';
-                $regrade_link = qualified_me() . '&confirm_regrade=1';
-                notice_yesno($message, $regrade_link, $back_link);
-                return GRADE_UPDATE_ITEM_LOCKED;
-            }
+            $message = get_string('gradeitemislocked', 'grades', $grade_item->itemname);
+            notice($message);
+            return GRADE_UPDATE_ITEM_LOCKED;
         }
 
         if ($itemdetails) {