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

* Finish task #65808.

Browse Source
This commit is contained in:
tianshujie
2022-08-23 15:02:57 +08:00
parent 545d74f7d0
commit dca2784559
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+2 -6
View File
@@ -1717,11 +1717,7 @@ class bugModel extends model
$moduleName = $this->app->rawMethod == 'work' ? 'workBug' : 'contributeBug';
$queryName = $moduleName . 'Query';
$formName = $moduleName . 'Form';
if(strpos($orderBy, 'pri_') !== false and strpos($orderBy, 'priOrder_') === false) $orderBy = str_replace('pri_', 'priOrder_', $orderBy);
if(strpos($orderBy, 'severity_') !== false and strpos($orderBy, 'severityOrder_') === false) $orderBy = str_replace('severity_', 'severityOrder_', $orderBy);
$bugIDList = array();
$bugIDList = array();
if($moduleName == 'contributeBug')
{
$bugsAssignedByMe = $this->loadModel('my')->getAssignedByMe($account, 0, '', $orderBy, 'bug');
@@ -1933,7 +1929,7 @@ class bugModel extends model
}
else
{
$bugs = $this->dao->select('t1.*, IF(t1.`pri` = 0, 999, t1.`pri`) as priOrder, IF(t1.`pri` = 0, 999, t1.`severity`) as severityOrder')->from(TABLE_BUG)->alias('t1')
$bugs = $this->dao->select('t1.*, IF(t1.`pri` = 0, 999, t1.`pri`) as priOrder, IF(t1.`severity` = 0, 999, t1.`severity`) as severityOrder')->from(TABLE_BUG)->alias('t1')
->leftJoin(TABLE_MODULE)->alias('t2')->on('t1.module=t2.id')
->where('t1.deleted')->eq(0)
->beginIF(!empty($productID) and $branchID !== 'all')->andWhere('t1.branch')->eq($branchID)->fi()
module/my/control.php
+5 -3
View File
@@ -337,7 +337,7 @@ EOF;
if($type == 'assignedBy')
{
$stories = $this->loadModel('my')->getAssignedByMe($this->app->user->account, '', $pager, $sort, 'story');
$stories = $this->my->getAssignedByMe($this->app->user->account, '', $pager, $sort, 'story');
}
elseif($type == 'bysearch')
{
@@ -402,7 +402,7 @@ EOF;
if($type == 'assignedBy')
{
$stories = $this->loadModel('my')->getAssignedByMe($this->app->user->account, '', $pager, $sort, 'requirement');
$stories = $this->my->getAssignedByMe($this->app->user->account, '', $pager, $sort, 'requirement');
}
elseif($type == 'bysearch')
{
@@ -571,9 +571,11 @@ EOF;
/* Append id for secend sort. */
$sort = common::appendOrder($orderBy);
if(strpos($sort, 'pri_') !== false and strpos($sort, 'priOrder_') === false) $sort = str_replace('pri_', 'priOrder_', $sort);
if(strpos($sort, 'severity_') !== false and strpos($sort, 'severityOrder_') === false) $sort = str_replace('severity_', 'severityOrder_', $sort);
if($type == 'assignedBy')
{
$bugs = $this->loadModel('my')->getAssignedByMe($this->app->user->account, '', $pager, $orderBy, 'bug');
$bugs = $this->my->getAssignedByMe($this->app->user->account, '', $pager, $sort, 'bug');
}
else
{