From 85ec2d1cc9e97ab11812cc83da7ff52dfdc44325 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Wed, 1 Dec 2021 16:11:35 +0800
Subject: [PATCH] * Fix bug #16967.

---
 module/my/view/testcase.html.php     | 4 ++--
 module/testcase/view/browse.html.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php
index f23b15d871..8c7469cc5f 100644
--- a/module/my/view/testcase.html.php
+++ b/module/my/view/testcase.html.php
@@ -77,7 +77,7 @@
               <label></label>
             </div>
             <?php endif;?>
-            <?php echo sprintf('%03d', $case->case); ?>
+            <?php echo sprintf('%03d', $case->id); ?>
           </td>
           <td><span class='label-pri <?php echo 'label-pri-' . $case->pri?>' title='<?php echo zget($lang->testcase->priList, $case->pri, $case->pri);?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
           <?php $params = "testcaseID=$caseID&version=$case->version";?>
@@ -117,7 +117,7 @@
         if($canBatchEdit)
         {
             $actionLink = $this->createLink('testcase', 'batchEdit', "productID=0&branch=all");
-            $misc       = "data-form-action='$actionLink'";
+            $misc       = "onclick=\"setFormAction('$actionLink', '', '#myCaseForm')\"";
             echo html::commonButton($lang->edit, $misc);
         }
         if($canBatchRun)
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index bb574ce338..33d134774b 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -129,7 +129,7 @@ js::set('suiteID',        $suiteID);
             echo html::commonButton($lang->testtask->runCase, $misc);
 
             $actionLink = $this->createLink('testcase', 'batchEdit', "productID=$productID&branch=$branch");
-            $misc       = $canBatchEdit ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'";
+            $misc       = $canBatchEdit ? "onclick=\"setFormAction('$actionLink', '', '#caseForm')\"" : "disabled='disabled'";
             echo html::commonButton($lang->edit, $misc);
             ?>
             <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>