diff --git a/module/product/model.php b/module/product/model.php index dad456e69e..cdd297a104 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -161,7 +161,6 @@ class productModel extends model if($this->cookie->preProductID != $this->session->product) { - $this->cookie->set('preBranch', 0); setcookie('preBranch', 0, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true); } return $this->session->product; diff --git a/module/testtask/model.php b/module/testtask/model.php index c789571313..8db479afcf 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -84,8 +84,8 @@ class testtaskModel extends model ->beginIF(!$this->app->user->admin)->andWhere('t3.id')->in("0,{$this->app->user->view->sprints}")->fi() ->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() - ->beginIF($scopeAndStatus[1] != 'totalStatus')->andWhere('t1.status')->eq($scopeAndStatus[1])->fi() + ->beginIF(strtolower($scopeAndStatus[1]) == 'totalstatus')->andWhere('t1.status')->in('blocked,doing,wait,done')->fi() + ->beginIF(strtolower($scopeAndStatus[1]) != 'totalstatus')->andWhere('t1.status')->eq($scopeAndStatus[1])->fi() ->beginIF($branch !== 'all')->andWhere("if(t4.branch, t4.branch, t5.branch) = '$branch'")->fi() ->beginIF($beginTime)->andWhere('t1.begin')->ge($beginTime)->fi() ->beginIF($endTime)->andWhere('t1.end')->le($endTime)->fi() diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php index c43420bb66..8e5da3fbbe 100644 --- a/module/testtask/view/browse.html.php +++ b/module/testtask/view/browse.html.php @@ -18,7 +18,7 @@ $scope = $this->session->testTaskVersionScope; $status = $this->session->testTaskVersionStatus; ?> - + @@ -35,6 +35,7 @@ $status = $this->session->testTaskVersionStatus; testtask->featureBar['browse'] as $key => $label):?> + $label", '', "id='{$key}Tab' class='btn btn-link'");?> recPerPage}&pageID=1"?>