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

* Optimize code for task #65808, #65807.

Browse Source
This commit is contained in:
liumengyi
2022-08-23 14:50:40 +08:00
parent 976de6e849
commit 545d74f7d0
9 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/projectrelease/control.php
+2 -2
View File
@@ -231,7 +231,7 @@ class projectrelease extends control
}
$sort = common::appendOrder($orderBy);
if(strpos($sort, 'priOrder') === false) $sort = str_replace('pri', 'priOrder', $sort);
if(strpos($sort, 'pri_') !== false and strpos($sort, 'priOrder_') === false) $sort = str_replace('pri_', 'priOrder_', $sort);
$storyPager = new pager($type == 'story' ? $recTotal : 0, $recPerPage, $type == 'story' ? $pageID : 1);
$stories = $this->dao->select('*, IF(`pri` = 0, 999, `pri`) as priOrder')->from(TABLE_STORY)
@@ -255,7 +255,7 @@ class projectrelease extends control
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'linkedBug');
$leftBugPager = new pager($type == 'leftBug' ? $recTotal : 0, $recPerPage, $type == 'leftBug' ? $pageID : 1);
if($type == 'leftBug' and strpos($orderBy, 'severity') !== false) $sort = str_replace('severity', 'severityOrder', $orderBy);
if($type == 'leftBug' and strpos($orderBy, 'severity_') !== false and strpos($orderBy, 'severityOrder_') === false) $sort = str_replace('severity_', 'severityOrder_', $sort);
$leftBugs = $this->dao->select('*, IF(`severity` = 0, 999, `severity`) as severityOrder')->from(TABLE_BUG)->where('id')->in($release->leftBugs)->andWhere('deleted')->eq(0)
->beginIF($type == 'leftBug')->orderBy($sort)->fi()