From 867152e2bcd9cf1c8520349d2c0a0240648951e2 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Wed, 18 May 2022 13:33:54 +0800
Subject: [PATCH] * fix bug #22570

---
 module/caselib/model.php  | 5 +++--
 module/release/model.php  | 5 +++--
 module/testtask/model.php | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/module/caselib/model.php b/module/caselib/model.php
index 756192f7a4..fe9fd3c30f 100644
--- a/module/caselib/model.php
+++ b/module/caselib/model.php
@@ -648,11 +648,12 @@ class caselibModel extends model
             $menu .= $this->buildMenu('testcase', 'review', $params, $case, 'browse', 'glasses', '', 'iframe');
         }
         $menu .= $this->buildMenu('testcase', 'edit', $params, $case, 'browse');
-        $deleteIconEnabled = $this->buildMenu('testcase', 'delete', $params, $case, 'browse', '', '', '', '', '', '', false);
+        $clickable = $this->buildMenu('testcase', 'delete', $params, $case, 'browse', '', '', '', '', '', '', false);
         if(common::hasPriv('testcase', 'delete'))
         {
             $deleteURL = helper::createLink('testcase', 'delete', "$params&confirm=yes");
-            $class = $deleteIconEnabled ? 'btn disabled' : 'btn';
+            $class = 'btn';
+            if(!$clickable) $class .= ' disabled';
             $menu .= html::a("javascript:ajaxDelete(\"$deleteURL\", \"caseList\", confirmDelete)", '<i class="icon icon-trash"></i>', '', "title='{$this->lang->testcase->delete}' class='{$class}'");
         }
 
diff --git a/module/release/model.php b/module/release/model.php
index 5f87032a6b..bc961e0975 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -737,12 +737,13 @@ class releaseModel extends model
         $menu .= $this->buildMenu('release', 'changeStatus', "$params&status=$changedStatus", $release, 'browse', $release->status == 'normal' ? 'pause' : 'play', 'hiddenwin', '', '', '',$this->lang->release->changeStatusList[$changedStatus]);
         $menu .= $this->buildMenu('release', 'edit',   "release=$release->id", $release, 'browse');
         $menu .= $this->buildMenu('release', 'notify', "release=$release->id", $release, 'browse', 'bullhorn', '', 'iframe', true);
-        $deleteIconEnabled = $this->buildMenu('release', 'delete', "release=$release->id", $release, 'browse', '', '', '', '', '', '', false);
+        $clickable = $this->buildMenu('release', 'delete', "release=$release->id", $release, 'browse', '', '', '', '', '', '', false);
 
         if(common::hasPriv('release', 'delete', $release))
         {
             $deleteURL = helper::createLink('release', 'delete', "releaseID=$release->id&confirm=yes");
-            $class = $deleteIconEnabled ? 'btn disabled' : 'btn';
+            $class = 'btn';
+            if(!$clickable) $class .= ' disabled';
             $menu .= html::a("javascript:ajaxDelete(\"$deleteURL\", \"releaseList\", confirmDelete)", '<i class="icon-trash"></i>', '', "class='{$class}' title='{$this->lang->release->delete}'");
         }
 
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 6cc4952168..59f9980726 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -2231,11 +2231,12 @@ class testtaskModel extends model
         $menu .= '</div>';
         $menu .= $this->buildMenu('testtask',   'view',     $params, $task, 'browse', 'list-alt', '', 'iframe', true, "data-width='90%'");
         $menu .= $this->buildMenu('testtask',   'edit',     $params, $task, 'browse');
-        $deleteIconEnabled = $this->buildMenu('testtask', 'delete', $params, $task, 'browse', '', '', '', '', '', '', false);
+        $clickable = $this->buildMenu('testtask', 'delete', $params, $task, 'browse', '', '', '', '', '', '', false);
         if(common::hasPriv('testtask', 'delete', $task))
         {
             $deleteURL = helper::createLink('testtask', 'delete', "taskID=$task->id&confirm=yes");
-            $class = $deleteIconEnabled ? 'btn disabled' : 'btn';
+            $class = 'btn';
+            if(!$clickable) $class .= ' disabled';
             $menu .= html::a("javascript:ajaxDelete(\"$deleteURL\",\"taskList\",confirmDelete)", '<i class="icon-common-delete icon-trash"></i>', '', "title='{$this->lang->testtask->delete}' class='{$class}'");
         }
         return $menu;