diff --git a/module/project/model.php b/module/project/model.php index c672ff613e..94c8d58ae7 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -617,17 +617,17 @@ class projectModel extends model } elseif($module == 'repo') { - $link = helper::createLink($module, 'browse', "repoID=&branchID=&objectID=%s#app=project"); + $link = helper::createLink($module, 'browse', "repoID=&branchID=&objectID=%s") . "#app=project"; } elseif($module == 'doc') { - $link = helper::createLink($module, 'tablecontents', "type=project&objectID=%s#app=project"); + $link = helper::createLink($module, 'tablecontents', "type=project&objectID=%s") . "#app=project"; } elseif($module == 'build') { if($method == 'create') { - $link = helper::createLink($module, $method, "executionID=&productID=&projectID=%s#app=project"); + $link = helper::createLink($module, $method, "executionID=&productID=&projectID=%s") . "#app=project"; } else { @@ -660,7 +660,7 @@ class projectModel extends model { if($method == 'projectsummary') { - $link = helper::createLink($module, $method, "projectID=%s#app=project"); + $link = helper::createLink($module, $method, "projectID=%s"). "#app=project"; } else { diff --git a/module/story/view/submitreview.html.php b/module/story/view/submitreview.html.php index d8865c9955..59037bfbff 100644 --- a/module/story/view/submitreview.html.php +++ b/module/story/view/submitreview.html.php @@ -27,7 +27,7 @@ -
story->reviewedBy;?>reviewer)) echo "class='required'";?>> + story->checkForceReview() or !empty($story->reviewer)) echo "class='required'";?>>
story->checkForceReview()):?>
@@ -43,7 +43,7 @@
- reviewer, "class='form-control picker-select' multiple required");?> + reviewer, "class='form-control picker-select' multiple");?>
diff --git a/module/testcase/control.php b/module/testcase/control.php index 2f7c3d0bcb..15f518d414 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -421,8 +421,9 @@ class testcase extends control setcookie('caseModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false); /* Use this session link, when the tab is not QA, a session of the case list exists, and the session is not from the Dynamic page. */ - $useSession = $this->app->tab != 'qa' and $this->session->caseList and strpos($this->session->caseList, 'dynamic') === false; - $response['locate'] = $useSession ? $this->session->caseList : $this->createLink('testcase', 'browse', "productID={$this->post->product}&branch={$this->post->branch}&browseType=all¶m=0&orderBy=id_desc"); + $useSession = ($this->app->tab != 'qa' and $this->session->caseList and strpos($this->session->caseList, 'dynamic') === false); + $locateLink = $this->app->tab == 'project' ? $this->createLink('project', 'testcase', "projectID={$this->session->project}") : $this->createLink('testcase', 'browse', "productID={$this->post->product}&branch={$this->post->branch}&browseType=all¶m=0&orderBy=id_desc"); + $response['locate'] = $useSession ? $this->session->caseList : $locateLink; return $this->send($response); } if(empty($this->products)) $this->locate($this->createLink('product', 'create'));