diff --git a/module/story/model.php b/module/story/model.php index 5aac48dc6c..a9c1280ead 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -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; diff --git a/module/testtask/model.php b/module/testtask/model.php index 6d39a18b5e..db3cf4acfb 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -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()