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

* finish task #3117.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+17 -11
View File
@@ -147,7 +147,7 @@ class bug extends control
$this->view->param = $param;
$this->view->orderBy = $orderBy;
$this->view->moduleID = $moduleID;
$this->view->memberPairs = $this->user->getPairs('noletter|nodeleted');
$this->view->memberPairs = $this->user->getPairs('noletter');
$this->view->branch = $branch;
$this->view->branches = $this->loadModel('branch')->getPairs($productID);
$this->view->setShowModule = true;
@@ -205,7 +205,7 @@ class bug extends control
*/
public function create($productID, $branch = '', $extras = '')
{
$this->view->users = $this->user->getPairs('nodeleted|devfirst|noclosed');
$this->view->users = $this->user->getPairs('devfirst|noclosed');
if(empty($this->products)) $this->locate($this->createLink('product', 'create'));
$this->app->loadLang('release');
@@ -423,7 +423,7 @@ class bug extends control
$this->view->productID = $productID;
$this->view->stories = $stories;
$this->view->builds = $builds;
$this->view->users = $this->user->getPairs('nodeleted,devfirst');
$this->view->users = $this->user->getPairs('devfirst');
$this->view->projects = $this->product->getProjectPairs($productID, $branch ? "0,$branch" : 0, $params = 'nodeleted');
$this->view->projectID = $projectID;
$this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0, $branch);
@@ -576,7 +576,7 @@ class bug extends control
$this->view->stories = $bug->project ? $this->story->getProjectStoryPairs($bug->project) : $this->story->getProductStoryPairs($bug->product, $bug->branch);
$this->view->branches = $this->session->currentProductType == 'normal' ? array() : $this->loadModel('branch')->getPairs($bug->product);
$this->view->tasks = $this->task->getProjectTaskPairs($bug->project);
$this->view->users = $this->user->getPairs('nodeleted', "$bug->assignedTo,$bug->resolvedBy,$bug->closedBy,$bug->openedBy");
$this->view->users = $this->user->getPairs('', "$bug->assignedTo,$bug->resolvedBy,$bug->closedBy,$bug->openedBy");
$this->view->openedBuilds = $openedBuilds;
$this->view->resolvedBuilds = array('' => '') + $openedBuilds + $oldResolvedBuild;
$this->view->actions = $this->action->getList('bug', $bugID);
@@ -679,7 +679,13 @@ class bug extends control
$this->view->showFields = $this->config->bug->custom->batchEditFields;
/* Set users. */
$users = $this->user->getPairs('nodeleted,devfirst');
$appendUsers = array();
foreach($bugs as $bug)
{
$appendUsers[$bug->assignedTo] = $bug->assignedTo;
$appendUsers[$bug->resolvedBy] = $bug->resolvedBy;
}
$users = $this->user->getPairs('devfirst', $appendUsers);
$users = array('' => '', 'ditto' => $this->lang->bug->ditto) + $users;
/* Assign. */
@@ -732,7 +738,7 @@ class bug extends control
$this->view->title = $this->products[$bug->product] . $this->lang->colon . $this->lang->bug->assignedTo;
$this->view->position[] = $this->lang->bug->assignedTo;
$this->view->users = $this->user->getPairs('nodeleted', $bug->assignedTo);
$this->view->users = $this->user->getPairs('', $bug->assignedTo);
$this->view->bug = $bug;
$this->view->bugID = $bugID;
$this->view->actions = $this->action->getList('bug', $bugID);
@@ -822,7 +828,7 @@ class bug extends control
$this->view->position[] = $this->lang->bug->confirmBug;
$this->view->bug = $bug;
$this->view->users = $this->user->getPairs('nodeleted', $bug->assignedTo);
$this->view->users = $this->user->getPairs('', $bug->assignedTo);
$this->view->actions = $this->action->getList('bug', $bugID);
$this->display();
}
@@ -884,7 +890,7 @@ class bug extends control
$bug = $this->bug->getById($bugID);
$productID = $bug->product;
$users = $this->user->getPairs('nodeleted');
$users = $this->user->getPairs();
$assignedTo = $bug->openedBy;
if(!isset($users[$assignedTo])) $assignedTo = $this->bug->getModuleOwner($bug->module, $productID);
unset($this->lang->bug->resolutionList['tostory']);
@@ -954,7 +960,7 @@ class bug extends control
$this->view->position[] = $this->lang->bug->activate;
$this->view->bug = $bug;
$this->view->users = $this->user->getPairs('nodeleted', $bug->resolvedBy);
$this->view->users = $this->user->getPairs('', $bug->resolvedBy);
$this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID, $bug->branch, 'noempty');
$this->view->actions = $this->action->getList('bug', $bugID);
@@ -1254,7 +1260,7 @@ class bug extends control
}
else
{
$projectMembers = $this->loadModel('user')->getPairs('nodeleted|devfirst|noclosed');
$projectMembers = $this->loadModel('user')->getPairs('devfirst|noclosed');
}
die(html::select('assignedTo', $projectMembers, $selectedUser, 'class="form-control"'));
@@ -1269,7 +1275,7 @@ class bug extends control
*/
public function ajaxLoadAllUsers($selectedUser = '')
{
$allUsers = $this->loadModel('user')->getPairs('nodeleted|devfirst|noclosed');
$allUsers = $this->loadModel('user')->getPairs('devfirst|noclosed');
die(html::select('assignedTo', $allUsers, $selectedUser, 'class="form-control"'));
}