From fdc4d29d3c834d142e51d4b0c283f4e3134f5d0e Mon Sep 17 00:00:00 2001
From: yfl <554665488@qq.com>
Date: Fri, 26 Apr 2019 09:40:57 +0800
Subject: [PATCH] * Finish Task #5405

---
 module/release/control.php         | 11 ++++++++---
 module/testcase/control.php        |  6 +++---
 module/testcase/view/view.html.php |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/module/release/control.php b/module/release/control.php
index ed06532073..31e28b6898 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -136,10 +136,15 @@ class release extends control
 
         $release = $this->release->getById((int)$releaseID, true);
         if(!$release) die(js::error($this->lang->notFound) . js::locate('back'));
+        
+        $stories = array();
+        if($link == 'false')
+        {
+            $stories = $this->dao->select('*')->from(TABLE_STORY)->where('id')->in($release->stories)->andWhere('deleted')->eq(0)
+                ->beginIF($type == 'story')->orderBy($orderBy)->fi()
+                ->fetchAll('id');
+        }
 
-        $stories = $this->dao->select('*')->from(TABLE_STORY)->where('id')->in($release->stories)->andWhere('deleted')->eq(0)
-            ->beginIF($type == 'story')->orderBy($orderBy)->fi()
-            ->fetchAll('id');
         $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story');
         $stages = $this->dao->select('*')->from(TABLE_STORYSTAGE)->where('story')->in($release->stories)->andWhere('branch')->eq($release->branch)->fetchPairs('story', 'stage');
         foreach($stages as $storyID => $stage)$stories[$storyID]->stage = $stage;
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 97fe369735..4ca20b8a80 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -807,16 +807,16 @@ class testcase extends control
      * @access public
      * @return void
      */
-    public function delete($caseID, $confirm = 'no')
+    public function delete($caseID, $runID ,$confirm = 'no')
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->testcase->confirmDelete, inlink('delete', "caseID=$caseID&confirm=yes")));
+            die(js::confirm($this->lang->testcase->confirmDelete, inlink('delete', "caseID=$caseID&runID=$runID&confirm=yes")));
         }
         else
         {
             $this->testcase->delete(TABLE_CASE, $caseID);
-
+            $this->dao->delete()->from(TABLE_TESTRUN)->where('id')->eq($runID)->exec();
             /* if ajax request, send result. */
             if($this->server->ajax)
             {
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index 9067b0ff5c..d06eb311b2 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -117,7 +117,7 @@
         common::printIcon('testcase', 'edit',"caseID=$case->id", $case);
         if(!$isLibCase) common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$case->id", $case, 'button', 'copy');
         if($isLibCase and common::hasPriv('testsuite', 'createCase')) echo html::a($this->createLink('testsuite', 'createCase', "libID=$case->lib&moduleID=$case->module&param=$case->id", $case), "<i class='icon-copy'></i>", '', "class='btn' title='{$lang->testcase->copy}'");
-        common::printIcon('testcase', 'delete', "caseID=$case->id", $case, 'button', 'trash', 'hiddenwin');
+        common::printIcon('testcase', 'delete', "caseID=$case->id&runID=$runID", $case, 'button', 'trash', 'hiddenwin');
         ?>
         <?php endif;?>
       </div>