From 730dc6354230213c551b83fff9b8867f98dadbd7 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 11 Oct 2022 10:44:21 +0000
Subject: [PATCH 1/3] * Fix bug#26935.

---
 module/story/view/submitreview.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 @@
       <table class='table table-form'>
         <tr>
           <th class='w-80px'><?php echo $lang->story->reviewedBy;?></th>
-          <td colspan='2' id='reviewerBox' <?php if(!empty($story->reviewer)) echo "class='required'";?>>
+          <td colspan='2' id='reviewerBox' <?php if($this->story->checkForceReview() or !empty($story->reviewer)) echo "class='required'";?>>
             <div class="table-row">
               <?php if(!$this->story->checkForceReview()):?>
               <div class="table-col">
@@ -43,7 +43,7 @@
               </div>
               <?php else:?>
               <div class="table-col">
-                <?php echo html::select('reviewer[]', $reviewers, $story->reviewer, "class='form-control picker-select' multiple required");?>
+                <?php echo html::select('reviewer[]', $reviewers, $story->reviewer, "class='form-control picker-select' multiple");?>
               </div>
               <?php endif;?>
             </div>

From 4eb54b95e6ee7e8a72c9125b9f494d7e1f40a842 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 11 Oct 2022 14:10:16 +0000
Subject: [PATCH 2/3] * Fix bug#26938.

---
 module/testcase/control.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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&param=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&param=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'));

From 8f8349b76f20f359939c8cff9b6c018d8996d57d Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 11 Oct 2022 14:57:05 +0000
Subject: [PATCH 3/3] * Fix bug#28296.

---
 module/project/model.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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
                 {