* finish task #3117.

This commit is contained in:
wangyidong
2017-08-14 10:05:30 +08:00
parent de0acf67ee
commit b91e47c2e7
24 changed files with 120 additions and 93 deletions
+4 -4
View File
@@ -156,7 +156,7 @@ class testtask extends control
$this->view->projects = $projects;
$this->view->productID = $productID;
$this->view->builds = $builds;
$this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted|qdfirst');
$this->view->users = $this->loadModel('user')->getPairs('noclosed|qdfirst');
$this->display();
}
@@ -286,7 +286,7 @@ class testtask extends control
$this->view->task = $task;
$this->view->runs = $runs;
$this->view->users = $this->loadModel('user')->getPairs('noclosed,qafirst');
$this->view->assignedTos = $this->loadModel('user')->getPairs('noclosed,nodeleted,qafirst');
$this->view->assignedTos = $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;
@@ -437,7 +437,7 @@ class testtask extends control
$this->view->task = $task;
$this->view->projects = $this->product->getProjectPairs($productID);
$this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID, $branch = 0, $params = '');
$this->view->users = $this->loadModel('user')->getPairs('nodeleted', $task->owner);
$this->view->users = $this->loadModel('user')->getPairs('', $task->owner);
$this->view->contactLists = $this->user->getContactLists($this->app->user->account, 'withnote');
$this->display();
@@ -564,7 +564,7 @@ class testtask extends control
$this->view->position[] = $this->lang->testtask->common;
$this->view->position[] = $this->lang->close;
$this->view->actions = $actions;
$this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted|qdfirst');
$this->view->users = $this->loadModel('user')->getPairs('noclosed|qdfirst');
$this->view->contactLists = $this->user->getContactLists($this->app->user->account, 'withnote');
$this->display();
}