From c7a282cdd367ca7434d0cb9b6c264eeb3614f5d4 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 26 Apr 2021 15:24:29 +0800
Subject: [PATCH 1/5]  * Fix bug #12401.

---
 module/product/view/view.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
index 2ae7a771db..1d9c4b9207 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -26,7 +26,7 @@
           </div>
           <?php if($product->type == 'platform'):?>
           <div class="detail">
-          <div class="detail-title"><strong><?php echo $lang->product->branchName['platform'];?></strong><a class="btn btn-link pull-right muted"><i class="icon icon-more icon-sm"></i></a></div>
+          <div class="detail-title"><strong><?php echo $lang->product->branchName['platform'];?></strong><a class="btn btn-link pull-right muted" href="<?php echo $this->createLink('branch', 'manage', "productID={$product->id}")?>"><i class="icon icon-more icon-sm"></i></a></div>
             <div class="detail-content">
               <ul class="clearfix branch-list">
                 <?php foreach($branches as $branchName):?>

From 09f16fe1b44e7ed8375fdb02b819c71d45ddf696 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Mon, 26 Apr 2021 15:25:42 +0800
Subject: [PATCH 2/5] * Fix bug#12376.

---
 module/product/view/browse.html.php      |  1 +
 module/projectrelease/control.php        |  1 +
 module/projectrelease/view/view.html.php |  2 +-
 module/story/control.php                 | 23 +++++++++++++++--------
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 9b10f31353..d04443ca66 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -341,6 +341,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
             <ul class='dropdown-menu'>
               <?php
               $class      = $canBatchClose ? '' : "class='disabled'";
+              $productID  = $this->app->openApp == 'project' ? 0 : $productID;
               $actionLink = $this->createLink('story', 'batchClose', "productID=$productID&projectID=0&storyType=$storyType");
               $misc = $canBatchClose ? "onclick=\"setFormAction('$actionLink')\"" : '';
               echo "<li $class>" . html::a('#', $lang->close, '', $misc) . "</li>";
diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php
index ffd095947b..49798c600d 100644
--- a/module/projectrelease/control.php
+++ b/module/projectrelease/control.php
@@ -193,6 +193,7 @@ class projectrelease extends control
     public function view($releaseID, $type = 'story', $link = 'false', $param = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 100, $pageID = 1)
     {
         $this->session->set('buildList', $this->app->getURI(true), 'execution');
+        $this->session->set('storyList', $this->app->getURI(true), $this->app->openApp);
 
         $this->loadModel('story');
         $this->loadModel('bug');
diff --git a/module/projectrelease/view/view.html.php b/module/projectrelease/view/view.html.php
index 10f6b0c836..19a2b34524 100644
--- a/module/projectrelease/view/view.html.php
+++ b/module/projectrelease/view/view.html.php
@@ -146,7 +146,7 @@
 
                   if(common::hasPriv('story', 'batchClose'))
                   {
-                      $closeURL = $this->createLink('story', 'batchClose', "productID=$release->product");
+                      $closeURL = $this->createLink('story', 'batchClose');
                       echo html::a("###", $lang->story->batchClose, '', "onclick='setFormAction(\"$closeURL\", \"\", this)' class='btn'");
                   }
                   ?>
diff --git a/module/story/control.php b/module/story/control.php
index 01077dc2d9..f921378519 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1195,18 +1195,25 @@ class story extends control
             $this->view->position[] = html::a($this->createLink('execution', 'story', "executionID=$execution->id"), $execution->name);
             $this->view->title      = $execution->name . $this->lang->colon . $this->lang->story->batchClose;
         }
-        /* The stories of my. */
         else
         {
-            $this->lang->story->menu      = $this->lang->my->menu;
-            $this->lang->story->menuOrder = $this->lang->my->menuOrder;
-            $this->loadModel('my')->setMenu();
+            if($this->app->openApp == 'project')
+            {
+                $this->project->setMenu($this->session->project);
+                $this->view->title = $this->lang->story->batchEdit;
+            }
+            else
+            {
+                $this->lang->story->menu      = $this->lang->my->menu;
+                $this->lang->story->menuOrder = $this->lang->my->menuOrder;
+                $this->loadModel('my')->setMenu();
 
-            if($from == 'work')       $this->lang->my->menu->work['subModule']       = 'story';
-            if($from == 'contribute') $this->lang->my->menu->contribute['subModule'] = 'story';
+                if($from == 'work')       $this->lang->my->menu->work['subModule']       = 'story';
+                if($from == 'contribute') $this->lang->my->menu->contribute['subModule'] = 'story';
 
-            $this->view->position[] = html::a($this->createLink('my', 'story'), $this->lang->my->story);
-            $this->view->title      = $this->lang->story->batchEdit;
+                $this->view->position[] = html::a($this->createLink('my', 'story'), $this->lang->my->story);
+                $this->view->title      = $this->lang->story->batchEdit;
+            }
         }
 
         /* Judge whether the editedStories is too large and set session. */

From c783202435571e1fb51ec72e47a08e765f0656ef Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 26 Apr 2021 16:10:58 +0800
Subject: [PATCH 3/5]  * Fix bug #12399.

---
 module/project/control.php        | 1 +
 module/project/view/view.html.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/project/control.php b/module/project/control.php
index 0a4c927da4..d379839dd4 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -443,6 +443,7 @@ class project extends control
             }
 
             $locateLink = $this->session->projectList ? $this->session->projectList : inLink('view', "projectID=$projectID");
+            if($from == 'projectView')    $locateLink = $this->createLink('project', 'view', "projectID=$projectID");
             if($from == 'program')        $locateLink = $this->createLink('program', 'browse');
             if($from == 'programProject') $locateLink = $this->session->programProject ? $this->session->programProject : $this->createLink('program', 'project', "projectID=$projectID");
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index a4143dd277..1971fd3e05 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -104,7 +104,7 @@
             echo $this->buildOperateMenu($project, 'view');
 
             echo "<div class='divider'></div>";
-            common::printIcon('project', 'edit', $params, $project, 'button', 'edit', '', '', '', '', $lang->edit);
+            common::printIcon('project', 'edit', $params . '&from=projectView', $project, 'button', 'edit', '', '', '', '', $lang->edit);
             common::printIcon('project', 'delete', $params, $project, 'button', 'trash', 'hiddenwin', '', '', '', $lang->delete);
         }
         ?>

From dde9bc9d5340e4ff87a3941284ac9d4f84b13b94 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Mon, 26 Apr 2021 16:25:35 +0800
Subject: [PATCH 4/5] * Fix bug#12367.

---
 module/bug/js/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index d35318470a..92ff94764e 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -544,7 +544,7 @@ function notice()
     if($('#openedBuild').find('option').length <= 1)
     {
         var html = '';
-        if($('#execution').length == 0 || $('#execution').val() == '')
+        if($('#execution').length == 0 || $('#execution').val() == 0)
         {
             var branch = $('#branch').val();
             if(typeof(branch) == 'undefined') branch = 0;

From 2d921f8262324ef82b16f9df5cfa2ec8957768ff Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 26 Apr 2021 16:38:29 +0800
Subject: [PATCH 5/5]  * Fix bug #12362.

---
 module/block/js/admin.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/block/js/admin.js b/module/block/js/admin.js
index 9586844079..19c387d4c9 100644
--- a/module/block/js/admin.js
+++ b/module/block/js/admin.js
@@ -15,7 +15,8 @@ $(function()
         }
         else
         {
-            var lang = config.clientLang;
+            var lang   = config.clientLang;
+            blockTitle = $blockParams.find('#title').val();
             if(lang.indexOf('zh') >= 0)
             {
                 if(blockTitle.indexOf(preValue) >= 0)