From a59fff9b5729c41035ff092bf697538dcec64889 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Fri, 16 Apr 2021 06:44:43 +0000
Subject: [PATCH] * Fix bug#12070.

---
 module/testcase/view/browse.html.php     | 9 +++++++--
 module/testcase/view/caseheader.html.php | 2 +-
 module/testsuite/view/linkcase.html.php  | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 82837912f6..103b6bf853 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -24,12 +24,13 @@ js::set('productID',      $productID);
 js::set('branch',         $branch);
 js::set('suiteID',        $suiteID);
 ?>
-<?php if($this->app->openApp == 'project'): ?>
+<?php if($this->app->openApp == 'project'):?>
 <style>
 #subHeader #dropMenu .col-left .list-group {margin-bottom: 0px; padding-top: 10px;}
 #subHeader #dropMenu .col-left {padding-bottom: 0px;}
 </style>
 <?php endif;?>
+
 <div id="mainContent" class="main-row fade">
   <div class='side-col' id='sidebar'>
     <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
@@ -53,10 +54,14 @@ js::set('suiteID',        $suiteID);
     <div class="table-empty-tip">
       <p>
         <span class="text-muted"><?php echo $lang->testcase->noCase;?></span>
-        <?php if(common::canModify('product', $product) and common::hasPriv('testcase', 'create')):?>
+        <?php if(common::canModify('product', $product) and common::hasPriv('testcase', 'create') and $browseType != 'bysuite'):?>
         <?php $initModule = isset($moduleID) ? (int)$moduleID : 0;?>
         <?php echo html::a($this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule"), "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-info' data-app='{$this->app->openApp}'");?>
         <?php endif;?>
+
+        <?php if(common::hasPriv('testsuite', 'linkCase') and $browseType == 'bysuite'):?>
+        <?php echo html::a($this->createLink('testsuite', 'linkCase', "suiteID=$param"), "<i class='icon icon-plus'></i> " . $lang->testsuite->linkCase, '', "class='btn btn-info' data-app='{$this->app->openApp}'");?>
+        <?php endif;?>
       </p>
     </div>
     <?php else:?>
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index abda0b29a4..f5d2fa7711 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -60,7 +60,7 @@
         $currentLable   = empty($currentSuite) ? $lang->testsuite->common : $currentSuite->name;
 
         echo "<div id='bysuiteTab' class='btn-group'>";
-        echo html::a('javascript:;', $currentLable . " <span class='caret'></span>", '', "class='btn btn-link' data-toggle='dropdown'");
+        echo html::a('javascript:;', "<span class='text'>{$currentLable}</span>" . " <span class='caret'></span>", '', "class='btn btn-link' data-toggle='dropdown'");
         if(common::canModify('product', $product))
         {
             echo "<ul class='dropdown-menu' style='max-height:240px; overflow-y:auto'>";
diff --git a/module/testsuite/view/linkcase.html.php b/module/testsuite/view/linkcase.html.php
index 27289f6e51..1b46d71c6c 100644
--- a/module/testsuite/view/linkcase.html.php
+++ b/module/testsuite/view/linkcase.html.php
@@ -49,8 +49,8 @@
       </thead>
       <tbody>
       <?php foreach($cases as $case):?>
-      <tr class='text-center'>
-        <td class='cell-id'>
+      <tr class='text-left'>
+        <td class='c-id'>
           <?php echo html::checkbox('cases', array($case->id => sprintf('%03d', $case->id)));?>
         </td>
         <td><?php echo html::select("versions[$case->id]", array_combine(range($case->version, 1), range($case->version, 1)), '', 'class="form-control"');?> </td>