Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* finish task #2015.

Browse Source
This commit is contained in:
chenfeiCF
2016-02-23 20:56:35 +08:00
parent 8373cc09cf
commit 8499ea4819
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/control.php
+1 -1
View File
@@ -314,7 +314,7 @@ class testtask extends control
$this->view->productID = $productID;
$this->view->productName = $this->products[$productID];
$this->view->task = $task;
$this->view->users = $this->loadModel('user')->getPairs('noclosed,nodeleted,qafirst');
$this->view->users = $this->loadModel('user')->getPairs('noclosed,qafirst');
$this->view->moduleTree = $this->loadModel('tree')->getTreeMenu($productID, $viewType = 'case', $startModuleID = 0, array('treeModel', 'createTestTaskLink'), $extra = $taskID);
$this->view->browseType = $browseType;
$this->view->param = $param;
module/user/model.php
+2 -2
View File
@@ -71,7 +71,7 @@ class userModel extends model
* If there's xxfirst in the params, use INSTR function to get the position of role fields in a order string,
* thus to make sure users of this role at first.
*/
$fields = 'account, realname';
$fields = 'account, realname, deleted';
if(strpos($params, 'pofirst') !== false) $fields .= ", INSTR(',pd,po,', role) AS roleOrder";
if(strpos($params, 'pdfirst') !== false) $fields .= ", INSTR(',po,pd,', role) AS roleOrder";
if(strpos($params, 'qafirst') !== false) $fields .= ", INSTR(',qd,qa,', role) AS roleOrder";
@@ -92,7 +92,7 @@ class userModel extends model
{
$firstLetter = ucfirst(substr($account, 0, 1)) . ':';
if(strpos($params, 'noletter') !== false) $firstLetter = '';
$users[$account] = $firstLetter . ($user->realname ? $user->realname : $account);
$users[$account] = $firstLetter . (($user->deleted == 1) ? $account : ($user->realname ? $user->realname : $account));
}
/* Append empty, closed, and guest users. */