From f5f19c135a8154a974c0329e31a34e28670df918 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Thu, 18 Mar 2021 15:29:11 +0800
Subject: [PATCH 1/3] * Fix bug.

---
 module/build/control.php           | 8 ++++----
 module/execution/model.php         | 2 +-
 module/project/view/build.html.php | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/module/build/control.php b/module/build/control.php
index 56a2e98ac2..d768e9aa81 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -63,7 +63,7 @@ class build extends control
         $products      = array();
         foreach($productGroups as $product) $products[$product->id] = $product->name;
 
-        $this->view->title      = $execution->name . $this->lang->colon . $this->lang->build->create;
+        $this->view->title      = $this->lang->build->create;
         $this->view->position[] = $this->lang->build->create;
 
         $this->view->product       = isset($productGroups[$productID]) ? $productGroups[$productID] : '';
@@ -110,7 +110,7 @@ class build extends control
         $build = $this->build->getById((int)$buildID);
 
         /* Set menu. */
-        $this->execution->setMenu($this->execution->getPairs($this->session->PRJ), $build->execution);
+        $this->execution->setMenu($this->execution->getPairs($build->project), $build->execution);
 
         /* Get stories and bugs. */
         $orderBy = 'status_asc, stage_asc, id_desc';
@@ -400,7 +400,7 @@ class build extends control
         $this->session->set('storyList', inlink('view', "buildID=$buildID&type=story&link=true&param=" . helper::safe64Encode("&browseType=$browseType&queryID=$param")));
         $build   = $this->build->getById($buildID);
         $product = $this->loadModel('product')->getById($build->product);
-        $this->loadModel('execution')->setMenu($this->execution->getPairs($this->session->PRJ), $build->execution);
+        $this->loadModel('execution')->setMenu($this->execution->getPairs($build->project), $build->execution);
         $this->loadModel('story');
         $this->loadModel('tree');
         $this->loadModel('product');
@@ -519,7 +519,7 @@ class build extends control
         /* Set menu. */
         $build   = $this->build->getByID($buildID);
         $product = $this->loadModel('product')->getByID($build->product);
-        $this->loadModel('execution')->setMenu($this->execution->getPairs($this->session->PRJ), $build->execution);
+        $this->loadModel('execution')->setMenu($this->execution->getPairs($build->project), $build->execution);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
diff --git a/module/execution/model.php b/module/execution/model.php
index 67423429e2..07d33a723e 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -920,7 +920,7 @@ class executionModel extends model
         if($projectID)
         {
             $executionModel = $this->dao->select('model')->from(TABLE_EXECUTION)->where('id')->eq($projectID)->andWhere('deleted')->eq(0)->fetch('model');
-            $orderBy = $executionModel == 'waterfall' ? 'sortStatus_asc,begin_asc,id_asc' : 'begin_desc';
+            $orderBy = $executionModel == 'waterfall' ? 'sortStatus_asc,begin_asc,id_asc' : 'id_desc';
 
             /* Waterfall execution, when all phases are closed, in reverse order of date. */
             if($executionModel == 'waterfall')
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index 8c68de6b57..9a616cdaa1 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -77,14 +77,14 @@
             {
                 echo html::a($this->createLink('build', 'view', "buildID=$build->id&type=story&link=true"), "<i class='icon icon-link'></i>", '', "class='btn' title='{$lang->build->linkStory}'");
             }
-            common::printIcon('testtask', 'create', "product=$build->product&project={$build->execution}&build=$build->id", $build, 'list', 'bullhorn');
+            common::printIcon('testtask', 'create', "product=$build->product&project={$build->execution}&build=$build->id", $build, 'list', 'bullhorn', '', '', '', "data-app='execution'");
             $lang->project->bug = $lang->execution->viewBug;
-            common::printIcon('project', 'bug',  "project={$build->execution}&orderBy=status&build=$build->id", $build, 'list');
+            common::printIcon('execution', 'bug',  "project={$build->execution}&orderBy=status&build=$build->id", $build, 'list', '', '', '', '', "data-app='execution'");
             common::printIcon('build',   'edit', "buildID=$build->id", $build, 'list');
             if(common::hasPriv('build',  'delete', $build))
             {
                 $deleteURL = $this->createLink('build', 'delete', "buildID=$build->id&confirm=yes");
-                echo html::a("javascript:ajaxDelete(\"$deleteURL\", \"buildList\", confirmDelete)", '<i class="icon-trash"></i>', '', "class='btn' title='{$lang->build->delete}'");
+                echo html::a("###", '<i class="icon-trash"></i>', '', "onclick='ajaxDelete(\"$deleteURL\", \"buildList\", confirmDelete)' class='btn' title='{$lang->build->delete}'");
             }
             ?>
           </td>

From fcf20e03ff64712d1ee56a5dde4cb219ed65b8c4 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Thu, 18 Mar 2021 15:39:35 +0800
Subject: [PATCH 2/3] * Fix bug.

---
 module/project/control.php         | 2 ++
 module/project/js/build.js         | 2 +-
 module/project/view/build.html.php | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index 066f76ad6c..9ba5a3b832 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -685,6 +685,8 @@ class project extends control
         $this->loadModel('build');
         $project   = $this->project->getByID($projectID);
 
+        $this->session->set('buildList', $this->app->getURI(true));
+
         /* Get products' list. */
         $products = $this->project->getProducts($projectID, false);
         $products = array('' => '') + $products;
diff --git a/module/project/js/build.js b/module/project/js/build.js
index fdab9a0141..e98b0b44e9 100644
--- a/module/project/js/build.js
+++ b/module/project/js/build.js
@@ -20,6 +20,6 @@ $(function()
  */
 function changeProduct(productID)
 {
-    link = createLink('project', 'build', 'type=product&param=' + productID);
+    link = createLink('project', 'build', 'projectID=' + projectID + '&type=product&param=' + productID);
     location.href = link;
 }
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index 9a616cdaa1..7a1a47cfaf 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -75,7 +75,7 @@
             <?php
             if(common::hasPriv('build', 'linkstory') and common::hasPriv('build', 'view') and common::canBeChanged('build', $build))
             {
-                echo html::a($this->createLink('build', 'view', "buildID=$build->id&type=story&link=true"), "<i class='icon icon-link'></i>", '', "class='btn' title='{$lang->build->linkStory}'");
+                echo html::a($this->createLink('build', 'view', "buildID=$build->id&type=story&link=true"), "<i class='icon icon-link'></i>", '', "class='btn' title='{$lang->build->linkStory}' data-app='project'");
             }
             common::printIcon('testtask', 'create', "product=$build->product&project={$build->execution}&build=$build->id", $build, 'list', 'bullhorn', '', '', '', "data-app='execution'");
             $lang->project->bug = $lang->execution->viewBug;

From ca5b1805159925c600c1d43d1e3b82168139caa0 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Thu, 18 Mar 2021 15:59:10 +0800
Subject: [PATCH 3/3] * Change PRJ to pass parameter.

---
 module/execution/view/testtask.html.php | 2 +-
 module/project/view/build.html.php      | 2 +-
 module/testtask/control.php             | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/module/execution/view/testtask.html.php b/module/execution/view/testtask.html.php
index 3d0475b5b0..5d4629f5c6 100644
--- a/module/execution/view/testtask.html.php
+++ b/module/execution/view/testtask.html.php
@@ -30,7 +30,7 @@
   <div class="btn-toolbar pull-right">
     <?php if(common::canModify('execution', $execution)):?>
     <?php common::printIcon('testreport', 'browse', "objectID=$executionID&objectType=execution", '', 'button','flag muted');?>
-    <?php common::printLink('testtask', 'create', "product=0&execution=$executionID", "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-primary'");?>
+    <?php common::printLink('testtask', 'create', "product=0&executionID=$executionID&build=&projectID=$execution->project", "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-primary'");?>
     <?php endif;?>
   </div>
 </div>
diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php
index 7a1a47cfaf..6ceca83724 100644
--- a/module/project/view/build.html.php
+++ b/module/project/view/build.html.php
@@ -77,7 +77,7 @@
             {
                 echo html::a($this->createLink('build', 'view', "buildID=$build->id&type=story&link=true"), "<i class='icon icon-link'></i>", '', "class='btn' title='{$lang->build->linkStory}' data-app='project'");
             }
-            common::printIcon('testtask', 'create', "product=$build->product&project={$build->execution}&build=$build->id", $build, 'list', 'bullhorn', '', '', '', "data-app='execution'");
+            common::printIcon('testtask', 'create', "product=$build->product&executionID={$build->execution}&build=$build->id&projectID=$projectID", $build, 'list', 'bullhorn', '', '', '', "data-app='execution'");
             $lang->project->bug = $lang->execution->viewBug;
             common::printIcon('execution', 'bug',  "project={$build->execution}&orderBy=status&build=$build->id", $build, 'list', '', '', '', '', "data-app='execution'");
             common::printIcon('build',   'edit', "buildID=$build->id", $build, 'list');
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 6310d2e720..6e4dffb9d2 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -186,7 +186,7 @@ class testtask extends control
      * @access public
      * @return void
      */
-    public function create($productID, $executionID = 0, $build = 0)
+    public function create($productID, $executionID = 0, $build = 0, $projectID = 0)
     {
         if(!empty($_POST))
         {
@@ -200,7 +200,6 @@ class testtask extends control
 
         /* Create testtask from testtask of test.*/
         $productID  = $productID ? $productID : key($this->products);
-        $projectID  = $this->lang->navGroup->testtask == 'qa' ? 0 : $this->session->PRJ;
         $executions = empty($productID) ? array() : $this->product->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID);
         $builds     = empty($productID) ? array() : $this->loadModel('build')->getProductBuildPairs($productID, 0, 'notrunk', true);