Merge branch 'master' into zenops_46

2022-09-30 15:07:37 +08:00
parent 6bed7509e7 05046906ea
commit 0afdc68654
81 changed files with 798 additions and 318 deletions
@@ -1197,7 +1197,18 @@ class task extends control
        if(isonlybody()) $this->session->set('estimateList', $uri . (strpos($uri, '?') === false ? '?' : '&')  . 'onlybody=yes', 'execution');

        $task = $this->task->getById($taskID);
-        if(!empty($task->team) and $task->mode == 'linear' and !$orderBy) $orderBy = 'order_asc';
+        if(!empty($task->team) and $task->mode == 'linear')
+        {
+            if(empty($orderBy))
+            {
+                $orderBy = 'order_asc,id';
+            }
+            else
+            {
+                /* The id sort with order or date style. */
+                $orderBy .= preg_replace('/(order_|date_)/', ',id_', $orderBy);
+            }
+        }
        if(!$orderBy) $orderBy = 'date_asc';

        $this->view->title   = $this->lang->task->record;