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

* Fix bug #3260,3186.

Browse Source
This commit is contained in:
tianshujie98
2020-07-03 17:20:24 +08:00
parent 29034b4a82
commit a28596cccc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/model.php
+1 -1
View File
@@ -835,7 +835,7 @@ class storyModel extends model
$story->version = $story->title == $oldStory->title ? $oldStory->version : $oldStory->version + 1;
if($story->stage != $oldStory->stage) $story->stagedBy = (strpos('tested|verified|released|closed', $story->stage) !== false) ? $this->app->user->account : '';
if($story->title != $oldStory->title) $story->status = 'changed';
if($story->title != $oldStory->title and $story->status != draft) $story->status = 'changed';
if($story->plan !== false and $story->plan == '') $story->plan = 0;
if($story->closedBy != false and $oldStory->closedDate == '') $story->closedDate = $now;
if($story->closedReason != false and $oldStory->closedDate == '') $story->closedDate = $now;
module/testtask/model.php
+1 -1
View File
@@ -258,7 +258,7 @@ class testtaskModel extends model
->where('t1.deleted')->eq(0)
->andWhere('t1.auto')->ne('unit')
->andWhere('t3.id')->in($this->app->user->view->projects)
->andWhere('t1.project')->in("0,{$this->app->user->view->projects}") //Fix bug #3260.
->beginIF($scopeAndStatus[0] == 'local')->andWhere('t1.product')->eq((int)$productID)->fi()
->beginIF($scopeAndStatus[0] == 'all')->andWhere('t1.product')->in($products)->fi()
->beginIF($scopeAndStatus[1] == 'totalStatus')->andWhere('t1.status')->in('blocked,doing,wait,done')->fi()