Merge branch 'MDL-26447_master' of https://github.com/crazyserver/moodle

jblotus · Nov 3, 2014 · f6b7d73 · f6b7d73
2 parents 520a32c + afa0968
commit f6b7d73
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/grade/edit/settings/form.php b/grade/edit/settings/form.php
@@ -75,15 +75,14 @@ function definition() {
 
         $options = array(-1                            => get_string('default', 'grades'),
                          GRADE_DISPLAY_TYPE_REAL       => get_string('real', 'grades'),
-                         GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
-                         GRADE_DISPLAY_TYPE_LETTER     => get_string('letter', 'grades'),
                          GRADE_DISPLAY_TYPE_REAL_PERCENTAGE => get_string('realpercentage', 'grades'),
                          GRADE_DISPLAY_TYPE_REAL_LETTER => get_string('realletter', 'grades'),
-                         GRADE_DISPLAY_TYPE_LETTER_REAL => get_string('letterreal', 'grades'),
-                         GRADE_DISPLAY_TYPE_LETTER_PERCENTAGE => get_string('letterpercentage', 'grades'),
+                         GRADE_DISPLAY_TYPE_PERCENTAGE => get_string('percentage', 'grades'),
+                         GRADE_DISPLAY_TYPE_PERCENTAGE_REAL => get_string('percentagereal', 'grades'),
                          GRADE_DISPLAY_TYPE_PERCENTAGE_LETTER => get_string('percentageletter', 'grades'),
-                         GRADE_DISPLAY_TYPE_PERCENTAGE_REAL => get_string('percentagereal', 'grades'));
-        asort($options);
+                         GRADE_DISPLAY_TYPE_LETTER     => get_string('letter', 'grades'),
+                         GRADE_DISPLAY_TYPE_LETTER_REAL => get_string('letterreal', 'grades'),
+                         GRADE_DISPLAY_TYPE_LETTER_PERCENTAGE => get_string('letterpercentage', 'grades'));
 
         $default_gradedisplaytype = $CFG->grade_displaytype;
         foreach ($options as $key=>$option) {
@@ -94,7 +93,7 @@ function definition() {
         }
         $mform->addElement('select', 'displaytype', get_string('gradedisplaytype', 'grades'), $options);
         $mform->addHelpButton('displaytype', 'gradedisplaytype', 'grades');
-
+        $mform->setDefault('displaytype', -1);
 
         $options = array(-1=> get_string('defaultprev', 'grades', $CFG->grade_decimalpoints), 0=>0, 1=>1, 2=>2, 3=>3, 4=>4, 5=>5);
         $mform->addElement('select', 'decimalpoints', get_string('decimalpoints', 'grades'), $options);