diff --git a/module/bug/model.php b/module/bug/model.php index 488731e875..5a67f4fd00 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -1325,7 +1325,7 @@ class bugModel extends model $bugs = $this->dao->select('*')->from(TABLE_BUG) ->where('deleted')->eq(0) ->beginIF(!$this->app->user->admin)->andWhere('project')->in('0,' . $this->app->user->view->projects)->fi() - ->beginIF($type != 'closedBy')->andWhere('status')->ne('closed')->fi() + ->beginIF($type != 'closedBy' and $this->app->moduleName == 'block')->andWhere('status')->ne('closed')->fi() ->beginIF($type != 'all')->andWhere("`$type`")->eq($account)->fi() ->orderBy($orderBy) ->beginIF($limit > 0)->limit($limit)->fi() diff --git a/module/story/model.php b/module/story/model.php index be8e3e58fd..a19f39095a 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -1771,7 +1771,7 @@ class storyModel extends model $stories = $this->dao->select('t1.*, t2.name as productTitle')->from(TABLE_STORY)->alias('t1') ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id') ->where('t1.deleted')->eq(0) - ->beginIF($type != 'closedBy')->andWhere('t1.status')->ne('closed')->fi() + ->beginIF($type != 'closedBy' and $this->app->moduleName == 'block')->andWhere('t1.status')->ne('closed')->fi() ->beginIF($type != 'all') ->beginIF($type == 'assignedTo')->andWhere('assignedTo')->eq($account)->fi() ->beginIF($type == 'openedBy')->andWhere('openedBy')->eq($account)->fi() diff --git a/module/task/model.php b/module/task/model.php index 710e70ba06..f304be7b1c 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1671,7 +1671,7 @@ class taskModel extends model ->leftjoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') ->leftjoin(TABLE_STORY)->alias('t3')->on('t1.story = t3.id') ->where('t1.deleted')->eq(0) - ->beginIF($type != 'closedBy')->andWhere('t1.status')->ne('closed')->fi() + ->beginIF($type != 'closedBy' and $this->app->moduleName == 'block')->andWhere('t1.status')->ne('closed')->fi() ->beginIF($type == 'finishedBy') ->andWhere('t1.finishedby', 1)->eq($account) ->orWhere('t1.finishedList')->like("%,{$account},%") diff --git a/module/testcase/model.php b/module/testcase/model.php index 9a98988a1a..561e024114 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -1459,11 +1459,6 @@ class testcaseModel extends model common::printIcon('testcase', 'confirmstorychange', "caseID=$case->id", $case, 'list', 'confirm', 'hiddenwin', '', '', '', $this->lang->confirm); break; } - if(isset($libCaseVersion) and $libCaseVersion > $case->version and !$case->needconfirm) - { - common::printIcon('testcase', 'confirmLibcasechange', "caseID=$case->id&libCaseID=$fromCaseID&version=$libCaseVersion", $case, 'list', 'confirm', 'hiddenwin', '', '', '', $this->lang->confirm); - break; - } common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", $case, 'list', '', '', 'iframe', true); common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", $case, 'list', 'play', '', 'runCase iframe', false, "data-width='95%'");