MDL-76146 gradereport_grader: Remove show lock icon preference.

2023-02-17 11:34:09 +08:00
parent 5eff5df97b
commit c1a3087f8b
9 changed files with 8 additions and 13 deletions
@@ -54,7 +54,6 @@ class provider implements
        // Show/hide toggles preferences.
        $items->add_user_preference('grade_report_showcalculations', 'privacy:metadata:preference:grade_report_showcalculations');
        $items->add_user_preference('grade_report_showaverages', 'privacy:metadata:preference:grade_report_showaverages');
-        $items->add_user_preference('grade_report_showlocks', 'privacy:metadata:preference:grade_report_showlocks');
        $items->add_user_preference('grade_report_showuserimage', 'privacy:metadata:preference:grade_report_showuserimage');
        $items->add_user_preference('grade_report_showactivityicons', 'privacy:metadata:preference:grade_report_showactivityicons');
        $items->add_user_preference('grade_report_showranges', 'privacy:metadata:preference:grade_report_showranges');
@@ -92,7 +91,6 @@ class provider implements
            switch ($name) {
                case 'grade_report_showcalculations':
                case 'grade_report_showaverages':
-                case 'grade_report_showlocks':
                case 'grade_report_showuserimage':
                case 'grade_report_showactivityicons':
                case 'grade_report_showranges':
@@ -7,3 +7,4 @@ ajaxfailedupdate,gradereport_grader
 ajaxfieldchanged,gradereport_grader
 ajaxchoosescale,gradereport_grader
 privacy:metadata:preference:grade_report_showeyecons,gradereport_grader
+privacy:metadata:preference:grade_report_showlocks,gradereport_grader
@@ -40,7 +40,6 @@ $string['privacy:metadata:preference:grade_report_showactivityicons'] = 'Whether
 $string['privacy:metadata:preference:grade_report_showanalysisicon'] = 'Whether to show grade analysis icon by default. If the activity module supports it, the grade analysis icon links to a page with more detailed explanation of the grade and how it was obtained.';
 $string['privacy:metadata:preference:grade_report_showaverages'] = 'Whether to display an additional row with the average (mean) for each category and grade item';
 $string['privacy:metadata:preference:grade_report_showcalculations'] = 'Whether a calculator icon for each grade item and category with a visual indicator that a grade item is calculated is displayed or not when editing is turned on';
-$string['privacy:metadata:preference:grade_report_showlocks'] = 'Whether to display a lock/unlock icon for each grade for controlling if the grade can be automatically updated by the related activity when editing is turned on';
 $string['privacy:metadata:preference:grade_report_shownumberofgrades'] = 'Whether to display in brackets after each average the number of grades used when calculating the average';
 $string['privacy:metadata:preference:grade_report_showonlyactiveenrol'] = 'Whether to display only active enrolled users (not suspended) in gradebook report or all the enrolled users';
 $string['privacy:metadata:preference:grade_report_showranges'] = 'Whether to display an additional row with the range for each category and grade item';
@@ -54,6 +53,7 @@ $string['cellactions'] = 'Cell actions';

 // Deprecated since Moodle 4.2.
 $string['privacy:metadata:preference:grade_report_showeyecons'] = 'Whether to display the show/hide icon for each grade for controlling its visibility to the student';
+$string['privacy:metadata:preference:grade_report_showlocks'] = 'Whether to display a lock/unlock icon for each grade for controlling if the grade can be automatically updated by the related activity when editing is turned on';
 $string['privacy:metadata:preference:grade_report_showquickfeedback'] = 'Whether to display a feedback text input box with a dotted border for each grade, allowing the feedback for many grades to be edited at the same time';
 $string['privacy:metadata:preference:grade_report_enableajax'] = 'Whether to add a layer of AJAX functionality to the grader report, simplifying and speeding up common operations';
 $string['useractivityfeedback'] = '{$a} feedback';
@@ -1659,10 +1659,7 @@ class grade_report_grader extends grade_report {

            $showhideicon = $this->gtree->get_hiding_icon($element, $this->gpr);

-            if ($this->get_pref('showlocks')) {
-                $lockunlockicon = $this->gtree->get_locking_icon($element, $this->gpr);
-            }
-
+            $lockunlockicon = $this->gtree->get_locking_icon($element, $this->gpr);
        }

        $gradeanalysisicon   = '';
@@ -61,7 +61,6 @@ class grader_report_preferences_form extends moodleform {
            if ($canviewhidden) {
                $preferences['prefshow']['showaverages']  = $checkbox_default;
            }
-            $preferences['prefshow']['showlocks']         = $checkbox_default;

            $preferences['prefrows'] = array(
                        'rangesdisplaytype'      => array(GRADE_REPORT_PREFERENCE_DEFAULT => '*default*',
@@ -53,9 +53,6 @@ if ($ADMIN->fulltree) {
    $settings->add(new admin_setting_configcheckbox('grade_report_showaverages', get_string('showaverages', 'grades'),
                                                get_string('showaverages_help', 'grades'), 1));

-    $settings->add(new admin_setting_configcheckbox('grade_report_showlocks', get_string('showlocks', 'grades'),
-                                                get_string('showlocks_help', 'grades'), 0));
-
    $settings->add(new admin_setting_configcheckbox('grade_report_showranges', get_string('showranges', 'grades'),
                                                get_string('showranges_help', 'grades'), 0));

@@ -76,3 +76,5 @@ enableajax,core_grades
 enableajax_help,core_grades
 showeyecons,core_grades
 showeyecons_help,core_grades
+showlocks,core_grades
+showlocks_help,core_grades
@@ -792,8 +792,6 @@ $string['showhiddenitems_help'] = 'Whether hidden grade items are hidden entirel
 * Only hidden until - Grade items with a "hide until" date set are hidden completely until the set date, after which the whole item is shown
 * Do not show - Hidden grade items are completely hidden';
 $string['showhiddenuntilonly'] = 'Only hidden until';
-$string['showlocks'] = 'Show locks';
-$string['showlocks_help'] = 'If enabled, when editing is turned on, a lock/unlock icon is shown for each grade for controlling whether the grade can be automatically updated by the related activity.';
 $string['shownohidden'] = 'Do not show';
 $string['shownooutcomes'] = 'Hide outcomes';
 $string['shownumberofgrades'] = 'Show number of grades in averages';
@@ -907,6 +905,8 @@ $string['tabs'] = 'Tabs';
 $string['combo'] = 'Tabs and drop-down menu';

 // Deprecated since Moodle 4.2.
+$string['showlocks'] = 'Show locks';
+$string['showlocks_help'] = 'If enabled, when editing is turned on, a lock/unlock icon is shown for each grade for controlling whether the grade can be automatically updated by the related activity.';
 $string['showeyecons'] = 'Show show/hide icons';
 $string['showeyecons_help'] = 'If enabled, when editing is turned on, a show/hide icon is shown for each grade for controlling its visibility to the student.';
 $string['showquickfeedback'] = 'Show quick feedback';
@@ -3,6 +3,7 @@ information provided here is intended especially for developers.

 === 4.2 ===

+* 'Show locks' setting has been removed from grader report (link is moved to grade action menu)
 * 'Show show/hide icons' setting has been removed from grader report (link is moved to grade action menu)
 * 'Enable AJAX' interface has been deprecated for grader report
 * 'Quick feedback' interface has been deprecated for grader report