MDL-12444 Removed aggregationview preference from grader report. Merged from MOODLE_1...

diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 40983bb9846b2f135f67c5033b6e22c0b471179e..259eb8a927fa35ee172b709bd0710ec1e154c463 100644 (file)
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -1050,7 +1050,7 @@ class grade_report_grader extends grade_report {
             $straverage = get_string('overallaverage', 'grades');
             $showaverages = $this->get_pref('showaverages');
             $showaverages_group = $this->currentgroup && $showaverages;
-            
+
             if ($showaverages_group) {
                 $studentshtml .= '<tr class="groupavg r'.$this->rowcount++.'"><th class="header c0" '.$colspan.'scope="row">'.$straverage_group.'</th></tr>';
             }
@@ -1396,7 +1396,6 @@ class grade_report_grader extends grade_report {
             $strswitch_whole = $this->get_lang_string('fullmode', 'grades');
 
             $expand_contract = 'switch_minus'; // Default: expanded
-            // $this->get_pref('aggregationview', $element['object']->id) == GRADE_REPORT_AGGREGATION_VIEW_COMPACT
 
             if (in_array($element['object']->id, $this->collapsed['aggregatesonly'])) {
                 $expand_contract = 'switch_plus';

diff --git a/grade/report/grader/preferences_form.php b/grade/report/grader/preferences_form.php
index bbd6041b51460853415184e38acf72bb3a7f8eb1..4c495ef2ca2132307050b1a39985f9119f3acc14 100644 (file)
--- a/grade/report/grader/preferences_form.php
+++ b/grade/report/grader/preferences_form.php
@@ -59,12 +59,6 @@ class grader_report_preferences_form extends moodleform {
 
         // Initialise the preferences arrays with grade:manage capabilities
         if (has_capability('moodle/grade:manage', $context)) {
-            $preferences['prefgeneral'] = array(
-                          'aggregationview'     => array(GRADE_REPORT_PREFERENCE_DEFAULT => '*default*',
-                                                         GRADE_REPORT_AGGREGATION_VIEW_FULL => get_string('fullmode', 'grades'),
-                                                         GRADE_REPORT_AGGREGATION_VIEW_AGGREGATES_ONLY => get_string('aggregatesonly', 'grades'),
-                                                         GRADE_REPORT_AGGREGATION_VIEW_GRADES_ONLY => get_string('gradesonly', 'grades')));
-
 
             $preferences['prefshow'] = array();
             $preferences['prefshow']['showcalculations']  = $checkbox_default;

diff --git a/grade/report/grader/settings.php b/grade/report/grader/settings.php
index dd9254be31763ead076116a82bf02c57d839931d..e990b647dbcf2e8ecb9db6b953566b73583c14b1 100644 (file)
--- a/grade/report/grader/settings.php
+++ b/grade/report/grader/settings.php
@@ -42,12 +42,6 @@ $settings->add(new admin_setting_configcheckbox('grade_report_showquickfeedback'
 $settings->add(new admin_setting_configcheckbox('grade_report_fixedstudents', get_string('fixedstudents', 'grades'),
                                             get_string('configfixedstudents', 'grades'), 0));
 
-$settings->add(new admin_setting_configselect('grade_report_aggregationview', get_string('aggregationview', 'grades'),
-                                          get_string('configaggregationview', 'grades'), GRADE_REPORT_AGGREGATION_VIEW_FULL,
-                                          array(GRADE_REPORT_AGGREGATION_VIEW_FULL => get_string('full', 'grades'),
-                                                GRADE_REPORT_AGGREGATION_VIEW_AGGREGATES_ONLY => get_string('aggregatesonly', 'grades'),
-                                                GRADE_REPORT_AGGREGATION_VIEW_GRADES_ONLY => get_string('gradesonly', 'grades'))));
-
 $settings->add(new admin_setting_configselect('grade_report_meanselection', get_string('meanselection', 'grades'),
                                           get_string('configmeanselection', 'grades'), GRADE_REPORT_MEAN_GRADED,
                                           array(GRADE_REPORT_MEAN_ALL => get_string('meanall', 'grades'),