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

* fix a bug #736.

Browse Source
This commit is contained in:
wangyidong
2015-09-10 15:39:38 +08:00
parent 8cf7c265c2
commit 3628e43f27
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+2 -3
View File
@@ -842,9 +842,8 @@ class bugModel extends model
public function getProjectBugs($projectID, $orderBy = 'id_desc', $pager = null, $build = 0)
{
$bugs = $this->dao->select('*')->from(TABLE_BUG)
->where('project')->eq((int)$projectID)
->beginIF($build != 0)->andWhere('openedBuild')->eq($build)->fi()
->andWhere('deleted')->eq(0)
->where('deleted')->eq(0)
->andWhere("(project = '" . (int)$projectID . "' " . (empty($build) ? '' : "OR CONCAT(',', openedBuild, ',') like '%,$build,%'") . ")")
->orderBy($orderBy)->page($pager)->fetchAll();
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug');
module/product/lang/en.php
+1 -1
View File
@@ -75,7 +75,7 @@ $lang->product->closedByMe = 'My closed';
$lang->product->draftStory = 'Draft';
$lang->product->activeStory = 'Active';
$lang->product->changedStory = 'Changed';
$lang->product->willClose = 'Will close';
$lang->product->willClose = 'Closing';
$lang->product->closedStory = 'Closed';
$lang->product->unclosed = 'Unclosed';