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

sprint_sunjun_54324

Browse Source
This commit is contained in:
sunjun
2022-05-18 01:42:09 +00:00
parent fca85b0bcc
commit fca35134b5
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/control.php
+10 -1
View File
@@ -487,6 +487,7 @@ EOF;
public function bug($type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save session. load Lang. */
$this->loadModel('bug');
if($this->app->viewType != 'json') $this->session->set('bugList', $this->app->getURI(true), 'qa');
$this->app->loadLang('bug');
@@ -497,7 +498,15 @@ EOF;
/* Append id for secend sort. */
$sort = common::appendOrder($orderBy);
$bugs = $this->loadModel('bug')->getUserBugs($this->app->user->account, $type, $sort, 0, $pager);
if($type == 'assignedBy')
{
$bugs = $this->loadModel('my')->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, '', 'bug');
}
else
{
$bugs = $this->loadModel('bug')->getUserBugs($this->app->user->account, $type, $sort, 0, $pager);
}
$bugs = $this->bug->checkDelayedBugs($bugs);
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug', false);
module/my/model.php
+9
View File
@@ -337,6 +337,15 @@ class myModel extends model
if($objectList) return $this->loadModel('task')->processTasks($objectList);
return array();
}
if($objectType == 'bug')
{
$productList = array();
foreach($objectList as $bug) $productList[$bug->product] = $bug->product;
$productPairs = $this->dao->select('id,name')->from(TABLE_PRODUCT)->where('id')->in($productList)->fetchPairs('id');
foreach($objectList as $bug) $bug->productName = zget($productPairs, $bug->product);
}
return $objectList;
}
}
module/my/view/bug.html.php
+1
View File
@@ -23,6 +23,7 @@
echo html::a(inlink($app->rawMethod, "mode=$mode&type=openedBy"), "<span class='text'>{$lang->bug->openedByMe}</span>" . ($type == 'openedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedBy' ? ' btn-active-text' : '') . "'");
echo html::a(inlink($app->rawMethod, "mode=$mode&type=resolvedBy"), "<span class='text'>{$lang->bug->resolvedByMe}</span>" . ($type == 'resolvedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'resolvedBy' ? ' btn-active-text' : '') . "'");
echo html::a(inlink($app->rawMethod, "mode=$mode&type=closedBy"), "<span class='text'>{$lang->bug->closedByMe}</span>" . ($type == 'closedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'closedBy' ? ' btn-active-text' : '') . "'");
echo html::a(inlink($app->rawMethod, "mode=$mode&type=assignedBy"), "<span class='text'>{$lang->my->assignedByMe}</span>" . ($type == 'assignedBy' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assignedBy' ? ' btn-active-text' : '') . "'");
}
?>
</div>