Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MDL-11924 Changed setting quickfeedback to showquickfeedback and adde…

…d the toggle accordingly.
  • Loading branch information...
commit 2758b9a780f5c618d2515f77743c85d4a4924cdf 1 parent 3fb558d
nicolasconnault authored
View
2  grade/report/grader/index.php
@@ -189,7 +189,7 @@
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>';
}
View
7 grade/report/grader/lib.php
@@ -418,6 +418,10 @@ function get_toggles_html() {
$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 @@ function print_toggle($type, $return=false) {
'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 @@ function get_studentshtml() {
// 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 />';
}
View
4 grade/report/grader/preferences_form.php
@@ -103,10 +103,10 @@ function definition() {
}
}
- // 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
View
4 grade/report/grader/settings.php
@@ -36,8 +36,8 @@
$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,
View
2  lang/en_utf8/grades.php
@@ -257,6 +257,7 @@
$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';
@@ -453,6 +454,7 @@
$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';
Please sign in to comment.
Something went wrong with that request. Please try again.