From 2ca093fa326c13ef942e56d90eccf736593ecf3f Mon Sep 17 00:00:00 2001
From: nicolasconnault <nicolasconnault>
Date: Wed, 27 Feb 2008 17:06:06 +0000
Subject: [PATCH] MDL-11924 Changed setting quickfeedback to showquickfeedback
 and added the toggle accordingly. Merging from MOODLE_19_STABLE

---
 grade/report/grader/index.php            | 2 +-
 grade/report/grader/lib.php              | 7 ++++++-
 grade/report/grader/preferences_form.php | 4 ++--
 grade/report/grader/settings.php         | 4 ++--
 lang/en_utf8/grades.php                  | 2 ++
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php
index d07423f9b0..5fe42bf527 100644
--- a/grade/report/grader/index.php
+++ b/grade/report/grader/index.php
@@ -189,7 +189,7 @@ if ($USER->gradeediting[$course->id]) {
 echo $reporthtml;
 
 // print submit button
-if ($USER->gradeediting[$course->id] && ($report->get_pref('quickfeedback') || $report->get_pref('quickgrading'))) {
+if ($USER->gradeediting[$course->id] && ($report->get_pref('showquickfeedback') || $report->get_pref('quickgrading'))) {
     echo '<div class="submit"><input type="submit" value="'.get_string('update').'" /></div>';
     echo '</div></form>';
 }
diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 9d18e10afe..beaa44387b 100644
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -417,6 +417,10 @@ class grade_report_grader extends grade_report {
              or has_capability('moodle/grade:unlock', $this->context)) {
                 $html .= $this->print_toggle('locks', true);
             }
+            if (has_capability('moodle/grade:manage', $this->context)) {
+                $html .= $this->print_toggle('quickfeedback', true);
+            }
+
             if (has_capability('moodle/grade:manage', $this->context)) {
                 $html .= $this->print_toggle('calculations', true);
             }
@@ -453,6 +457,7 @@ class grade_report_grader extends grade_report {
                        'calculations' => 't/calc.gif',
                        'locks' => 't/lock.gif',
                        'averages' => 't/mean.gif',
+                       'quickfeedback' => 't/feedback.gif',
                        'nooutcomes' => 't/outcomes.gif');
 
         $pref_name = 'grade_report_show' . $type;
@@ -845,7 +850,7 @@ class grade_report_grader extends grade_report {
 
 
                     // If quickfeedback is on, print an input element
-                    if ($this->get_pref('quickfeedback') and $grade->is_editable()) {
+                    if ($this->get_pref('showquickfeedback') and $grade->is_editable()) {
                         if ($this->get_pref('quickgrading')) {
                             $studentshtml .= '<br />';
                         }
diff --git a/grade/report/grader/preferences_form.php b/grade/report/grader/preferences_form.php
index 5c5df2711f..6701662275 100644
--- a/grade/report/grader/preferences_form.php
+++ b/grade/report/grader/preferences_form.php
@@ -103,10 +103,10 @@ class grader_report_preferences_form extends moodleform {
             }
         }
 
-        // quickgrading and quickfeedback are conditional on grade:edit capability
+        // quickgrading and showquickfeedback are conditional on grade:edit capability
         if (has_capability('moodle/grade:edit', $context)) {
             $preferences['prefgeneral']['quickgrading'] = $checkbox_default;
-            $preferences['prefgeneral']['quickfeedback'] = $checkbox_default;
+            $preferences['prefgeneral']['showquickfeedback'] = $checkbox_default;
         }
 
         // View capability is the lowest permission. Users with grade:manage or grade:edit must also have grader:view
diff --git a/grade/report/grader/settings.php b/grade/report/grader/settings.php
index 5c0149bf83..be93ebbfa4 100644
--- a/grade/report/grader/settings.php
+++ b/grade/report/grader/settings.php
@@ -36,8 +36,8 @@ $settings->add(new admin_setting_configtext('grade_report_studentsperpage', get_
 $settings->add(new admin_setting_configcheckbox('grade_report_quickgrading', get_string('quickgrading', 'grades'),
                                             get_string('configquickgrading', 'grades'), 1));
 
-$settings->add(new admin_setting_configcheckbox('grade_report_quickfeedback', get_string('quickfeedback', 'grades'),
-                                            get_string('configquickfeedback', 'grades'), 1));
+$settings->add(new admin_setting_configcheckbox('grade_report_showquickfeedback', get_string('quickfeedback', 'grades'),
+                                            get_string('configquickfeedback', 'grades'), 0));
 
 $settings->add(new admin_setting_configselect('grade_report_aggregationview', get_string('aggregationview', 'grades'),
                                           get_string('configaggregationview', 'grades'), GRADE_REPORT_AGGREGATION_VIEW_FULL,
diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php
index 1bb48c4db2..1be33525c0 100644
--- a/lang/en_utf8/grades.php
+++ b/lang/en_utf8/grades.php
@@ -256,6 +256,7 @@ $string['hideverbose'] = 'Hide $a->category$a->itemmodule $a->itemname';
 $string['highgradeascending'] = 'Sort by high grade ascending';
 $string['highgradedescending'] = 'Sort by high grade descending';
 $string['highgradeletter'] = 'High';
+$string['hidequickfeedback'] = 'Hide Quick Feedback';
 $string['idnumberhelp'] = 'Arbitrary idnumber provided by the module responsible (must be defined and unique).';
 $string['idnumbers'] = 'Id numbers';
 $string['identifier'] = 'Identify user by';
@@ -452,6 +453,7 @@ $string['showlocks'] = 'Show locks';
 $string['shownohidden'] = 'No hidden';
 $string['shownooutcomes'] = 'Hide outcomes';
 $string['shownumberofgrades'] = 'Show number of grades in averages';
+$string['showquickfeedback'] = 'Show Quick Feedback';
 $string['showranges'] = 'Show ranges';
 $string['showrank'] = 'Show rank';
 $string['showuseridnumber'] = 'Show user idnumber';
-- 
2.39.5