From 0dddf6deda689aa13af669f4c15d09f62fc90d0f Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Tue, 14 Jul 2020 02:02:13 -0700
Subject: [PATCH] * Finish task#7346.

---
 module/testcase/model.php               | 2 +-
 module/testtask/view/groupcase.html.php | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/module/testcase/model.php b/module/testcase/model.php
index 81dc880006..00b9125aea 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -287,7 +287,7 @@ class testcaseModel extends model
             $data[$i]->type         = $cases->type[$i];
             $data[$i]->pri          = $cases->pri[$i];
             $data[$i]->stage        = empty($cases->stage[$i]) ? '' : implode(',', $cases->stage[$i]);
-            $data[$i]->story        = $storyID ? $storyID : $cases->story[$i];
+            $data[$i]->story        = $cases->story[$i];
             $data[$i]->color        = $cases->color[$i];
             $data[$i]->title        = $cases->title[$i];
             $data[$i]->precondition = $cases->precondition[$i];
diff --git a/module/testtask/view/groupcase.html.php b/module/testtask/view/groupcase.html.php
index 74c834e120..427c848a95 100644
--- a/module/testtask/view/groupcase.html.php
+++ b/module/testtask/view/groupcase.html.php
@@ -14,6 +14,7 @@
 <?php include '../../common/view/treetable.html.php';?>
 <?php include './caseheader.html.php';?>
 <?php js::set('browseType', $browseType);?>
+<?php js::set('confirmUnlink', $lang->testtask->confirmUnlinkCase)?>
 <div class="main-table" data-ride="table" data-checkable="false" data-group="true">
   <table class='table table-grouped text-center' id='treetable'>
     <thead>
@@ -77,7 +78,13 @@
         <td class='c-actions'>
           <?php common::printIcon('testtask', 'runCase', "runID=$run->id&caseID=$run->case&version=$run->caseVersion", '', 'list', 'play', '', 'runCase iframe', false, "data-width='95%'");?>
           <?php common::printIcon('testcase', 'edit', "caseID=$run->case", '', 'list');?>
-          <?php common::printIcon('testcase', 'delete', "caseID=$run->case", '', 'list', '', 'hiddenwin');?>
+          <?php
+                if(common::hasPriv('testtask', 'unlinkCase', $run))
+                {
+                    $unlinkURL = helper::createLink('testtask', 'unlinkCase', "caseID=$run->id&confirm=yes");
+                    echo html::a("javascript:ajaxDelete(\"$unlinkURL\", \"casesForm\", confirmUnlink)", '<i class="icon-unlink"></i>', '', "title='{$this->lang->testtask->unlinkCase}' class='btn'");
+                }
+          ?>
         </td>
       </tr>
       <?php $i++;?>