MDL-11924 Changed setting quickfeedback to showquickfeedback and added the toggle...

diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php
index d07423f9b09b490dbc0ec98d02c55a2dfd197adc..5fe42bf527194f66a6e1a95006e8538c3600545b 100644 (file)
--- 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 9d18e10afeb72d1fb9a099ef6a1f559719279610..beaa44387becd81f68957e78e2f58aa51401d8c5 100644 (file)
--- 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 5c5df2711fc151edb0f33430fa5716de56330e1b..6701662275533c128b42615f316ad75fbb7b14bb 100644 (file)
--- 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 5c0149bf83e7e89f908b6ab6b09dd2a1fa0eaef8..be93ebbfa49416c17a78855dd34dd3fb04b59347 100644 (file)
--- 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 1bb48c4db2936a64647d7dcc2734a9d5748636cf..1be33525c08b5feaae13f699ac3927b53054f428 100644 (file)
--- 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';