From a9862dc312898fd0af701d1ffe640431905aff66 Mon Sep 17 00:00:00 2001
From: lichengjun <lichengjun@easycorp.ltd>
Date: Wed, 14 Jul 2021 21:21:36 +0800
Subject: [PATCH] * Fix Bug 13654 and 13651.

---
 module/gitlab/config.php                | 6 +++++-
 module/gitlab/control.php               | 2 +-
 module/gitlab/view/importissue.html.php | 1 +
 module/task/view/create.html.php        | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/module/gitlab/config.php b/module/gitlab/config.php
index 84ee284a8d..14917d23b7 100644
--- a/module/gitlab/config.php
+++ b/module/gitlab/config.php
@@ -100,5 +100,9 @@ $config->gitlab->objectTables->story = TABLE_STORY;
 $config->gitlab->objectTables->task  = TABLE_TASK;
 $config->gitlab->objectTables->bug   = TABLE_BUG;
 
-$config->gitlab->objectTypes = array('', 'task', 'bug', 'story'); 
+$config->gitlab->objectTypes = array(); 
+$config->gitlab->objectTypes['']      = ''; 
+$config->gitlab->objectTypes['task']  = '任务'; 
+$config->gitlab->objectTypes['bug']   = 'bug'; 
+$config->gitlab->objectTypes['story'] = '需求'; 
 
diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index cf0d2a7750..071ad49f37 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -276,7 +276,7 @@ class gitlab extends control
             {
                 if($executionID) 
                 {
-                    $objectType = $this->config->gitlab->objectTypes[$objectTypeList[$issueID]];
+                    $objectType = $objectTypeList[$issueID];
                     $issue = $this->gitlab->apiGetSingleIssue($gitlabID, $projectID, $issueID);
                     $issue->objectType    = $objectType;
                     $issue->objectID      = 0; // meet the required parameters for issueToZentaoObject.
diff --git a/module/gitlab/view/importissue.html.php b/module/gitlab/view/importissue.html.php
index 9cf632623c..4735effda7 100644
--- a/module/gitlab/view/importissue.html.php
+++ b/module/gitlab/view/importissue.html.php
@@ -41,6 +41,7 @@
         </tbody>
         <tfoot>
           <tr>
+            <th></th>
             <td class="text-center form-actions">
               <?php echo html::submitButton($lang->save);?>
               <?php if(!isonlybody()) echo html::a(inlink('browse', ""), $lang->goback, '', 'class="btn btn-wide"'); ?>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
index 060395a804..0b8d9e51c4 100644
--- a/module/task/view/create.html.php
+++ b/module/task/view/create.html.php
@@ -244,7 +244,7 @@
         <tr>
           <th><?php echo $lang->task->sync2Gitlab;?></th>
           <td><?php echo html::select('gitlab', $gitlabList, '', "class='form-control chosen'");?></td>
-          <td><?php echo html::select('gitlabProject', '', '', "class='form-control chosen'");?></td>
+          <td><?php echo html::select('gitlabProject', '', '', "class='w-50px form-control chosen'");?></td>
         </tr>
         <?php endif;?>
         <tr id='after-tr'>