From ec0c6bd04ba45dddc4cd0243fac7f9b61762bd1c Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Fri, 16 Apr 2021 15:52:47 +0800
Subject: [PATCH 1/2]  * Fix bug #12194.

---
 module/testcase/view/caseheader.html.php | 2 +-
 module/testcase/view/showimport.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index f5d2fa7711..dd5e3a95ed 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -125,7 +125,7 @@
       $class = common::hasPriv('testcase', 'exportTemplet') ? '' : "class=disabled";
       $misc  = common::hasPriv('testcase', 'exportTemplet') ? "class='export'" : "class=disabled";
       $link  = common::hasPriv('testcase', 'exportTemplet') ?  $this->createLink('testcase', 'exportTemplet', "productID=$productID") : '#';
-      echo "<li $class>" . html::a($link, $lang->testcase->exportTemplet, '', $misc . "data-app={$this->app->openApp} data-width='40%'") . "</li>";
+      echo "<li $class>" . html::a($link, $lang->testcase->exportTemplet, '', $misc . "data-app={$this->app->openApp} data-width='50%'") . "</li>";
       ?>
       </ul>
     </div>
diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index 403b69843c..0f80787c47 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -87,7 +87,7 @@ $(function()
           <?php $storyID = isset($case->story) ? $case->story : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->story : '');?>
           <?php echo html::select("story[$key]", array($storyID => zget($stories, $storyID, '')), $storyID, "class='form-control chosen storyChange'")?></td>
           <td><?php echo html::select("pri[$key]", $lang->testcase->priList, isset($case->pri) ? $case->pri : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->pri : ''), "class='form-control chosen'")?></td>
-          <td><?php echo html::select("type[$key]", $lang->testcase->typeList, $case->type, "class='form-control chosen'")?></td>
+          <td><?php echo html::select("type[$key]", $lang->testcase->typeList, isset($case->type) ? $case->type : '', "class='form-control chosen'")?></td>
           <td style='overflow:visible'><?php echo html::select("stage[$key][]", $lang->testcase->stageList, !empty($case->stage) ? $case->stage : ((!empty($case->id) and isset($cases[$case->id])) ? $cases[$case->id]->stage : ''), "multiple='multiple' class='form-control chosen'")?></td>
           <td><?php echo html::textarea("precondition[$key]", isset($case->precondition) ? htmlspecialchars($case->precondition) : "", "class='form-control'")?></td>
           <?php if(!empty($appendFields)):?>

From bfa6fa768fe1ef0fbe79698dddaf5d684f5d4c72 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Fri, 16 Apr 2021 16:01:21 +0800
Subject: [PATCH 2/2] * Fix bug#12082.

---
 module/jenkins/view/edit.html.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/module/jenkins/view/edit.html.php b/module/jenkins/view/edit.html.php
index 947672eba0..04b26aa7f9 100644
--- a/module/jenkins/view/edit.html.php
+++ b/module/jenkins/view/edit.html.php
@@ -19,10 +19,6 @@
       </div>
       <form id='jenkinsForm' method='post' class='form-ajax'>
         <table class='table table-form'>
-          <tr>
-            <th class='thWidth'></th>
-            <td colspan="2"><?php echo $lang->jenkins->tips; ?></td>
-          </tr>
           <tr>
             <th><?php echo $lang->jenkins->name; ?></th>
             <td class='required'><?php echo html::input('name', $jenkins->name, "class='form-control'"); ?></td>