* Fix bug #39885.
This commit is contained in:
@@ -188,7 +188,7 @@ class execution extends control
|
||||
$this->app->session->set('taskList', $uri . "#app={$this->app->tab}", 'execution');
|
||||
|
||||
/* Process the order by field. */
|
||||
if(!$orderBy) $orderBy = $this->cookie->executionTaskOrder ? $this->cookie->executionTaskOrder : 'status,id_desc';
|
||||
if(!$orderBy) $orderBy = $this->cookie->executionTaskOrder ? $this->cookie->executionTaskOrder : 'status,id_asc';
|
||||
setcookie('executionTaskOrder', $orderBy, 0, $this->config->webRoot, '', false, true);
|
||||
|
||||
/* Append id for secend sort. */
|
||||
|
||||
@@ -2587,7 +2587,7 @@ class executionModel extends model
|
||||
->where('deleted')->eq(0)
|
||||
->andWhere('status')->notin('closed,cancel')
|
||||
->andWhere('execution')->in($executionIdList)
|
||||
->orderBy('order_asc,id_desc')
|
||||
->orderBy('order_asc,id_asc')
|
||||
->fetchGroup('execution', 'id');
|
||||
|
||||
$taskIdList = array();
|
||||
|
||||
@@ -259,7 +259,7 @@ class programplanModel extends model
|
||||
|
||||
if(empty($selectCustom)) $selectCustom = $this->loadModel('setting')->getItem("owner={$owner}&module={$module}§ion={$section}&key={$object}");
|
||||
|
||||
$tasks = $this->dao->select('*')->from(TABLE_TASK)->where('deleted')->eq(0)->andWhere('execution')->in($planIdList)->orderBy('execution_asc, order_asc, id_desc')->fetchAll('id');
|
||||
$tasks = $this->dao->select('*')->from(TABLE_TASK)->where('deleted')->eq(0)->andWhere('execution')->in($planIdList)->orderBy('execution_asc, order_asc, id_asc')->fetchAll('id');
|
||||
$taskTeams = $this->dao->select('task,account')->from(TABLE_TASKTEAM)->where('task')->in(array_keys($tasks))->fetchGroup('task', 'account');
|
||||
$users = $this->loadModel('user')->getPairs('noletter');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user