Merge branch 'MDL-66549-master' of git://github.com/ilyatregubov/moodle

clenisson · Sep 22, 2021 · 3de9a4d · 3de9a4d
2 parents ed0d7ef + a5ab9e4
commit 3de9a4d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
@@ -369,19 +369,11 @@ private function setup_sortitemid() {
 
         if ($this->sortitemid) {
             if (!isset($SESSION->gradeuserreport->sort)) {
-                if ($this->sortitemid == 'firstname' || $this->sortitemid == 'lastname') {
-                    $this->sortorder = $SESSION->gradeuserreport->sort = 'ASC';
-                } else {
-                    $this->sortorder = $SESSION->gradeuserreport->sort = 'DESC';
-                }
+                $this->sortorder = $SESSION->gradeuserreport->sort = 'ASC';
             } else {
                 // this is the first sort, i.e. by last name
                 if (!isset($SESSION->gradeuserreport->sortitemid)) {
-                    if ($this->sortitemid == 'firstname' || $this->sortitemid == 'lastname') {
-                        $this->sortorder = $SESSION->gradeuserreport->sort = 'ASC';
-                    } else {
-                        $this->sortorder = $SESSION->gradeuserreport->sort = 'DESC';
-                    }
+                    $this->sortorder = $SESSION->gradeuserreport->sort = 'ASC';
                 } else if ($SESSION->gradeuserreport->sortitemid == $this->sortitemid) {
                     // same as last sort
                     if ($SESSION->gradeuserreport->sort == 'ASC') {
@@ -390,11 +382,7 @@ private function setup_sortitemid() {
                         $this->sortorder = $SESSION->gradeuserreport->sort = 'ASC';
                     }
                 } else {
-                    if ($this->sortitemid == 'firstname' || $this->sortitemid == 'lastname') {
-                        $this->sortorder = $SESSION->gradeuserreport->sort = 'ASC';
-                    } else {
-                        $this->sortorder = $SESSION->gradeuserreport->sort = 'DESC';
-                    }
+                    $this->sortorder = $SESSION->gradeuserreport->sort = 'ASC';
                 }
             }
             $SESSION->gradeuserreport->sortitemid = $this->sortitemid;

diff --git a/grade/report/lib.php b/grade/report/lib.php
@@ -417,7 +417,7 @@ public function setup_users() {
     protected function get_sort_arrow($direction='move', $sortlink=null) {
         global $OUTPUT;
         $pix = array('up' => 't/sort_desc', 'down' => 't/sort_asc', 'move' => 't/sort');
-        $matrix = array('up' => 'desc', 'down' => 'asc', 'move' => 'desc');
+        $matrix = array('up' => 'desc', 'down' => 'asc', 'move' => 'asc');
         $strsort = $this->get_lang_string('sort' . $matrix[$direction]);
 
         $arrow = $OUTPUT->pix_icon($pix[$direction], '', '', ['class' => 'sorticon']);