From ab5910454b96dccb04d3676c60048d562eb0b129 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Tue, 15 Mar 2022 08:40:33 +0800
Subject: [PATCH]  * Fix bug #20743,#20209.

---
 module/gitlab/control.php        | 2 +-
 module/repo/css/common.css       | 1 +
 module/repo/view/create.html.php | 3 +--
 module/repo/view/edit.html.php   | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index edbd1113e5..ae10a06ec4 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -227,8 +227,8 @@ class gitlab extends control
         $this->loadModel('action');
         $this->gitlab->delete(TABLE_PIPELINE, $id);
 
+        $actionID = $this->dao->lastInsertID();
         $gitLab   = $this->gitlab->getByID($id);
-        $actionID = $this->action->create('gitlab', $id, 'deleted');
         $changes  = common::createChanges($oldGitLab, $gitLab);
         $this->action->logHistory($actionID, $changes);
         echo js::reload('parent');
diff --git a/module/repo/css/common.css b/module/repo/css/common.css
index dd6f423b0d..d135e566c7 100644
--- a/module/repo/css/common.css
+++ b/module/repo/css/common.css
@@ -11,6 +11,7 @@ h3 {font-size: 16px;}
 .mini-icon {display: inline-block; height: 16px; width: 16px; background-color: transparent; background-position: 0 0; background-repeat: no-repeat; vertical-align: text-bottom;}
 .action {float: left;}
 .input-group select#encrypt {border-left: 0px;}
+.input-group #encrypt_chosen {width: 40% !important;}
 .arrange {float: right;}
 .versions {position: relative;}
 #diffRepo {position: absolute; left: 20px; z-index: 1000;}
diff --git a/module/repo/view/create.html.php b/module/repo/view/create.html.php
index 0801c000e6..48f670b358 100644
--- a/module/repo/view/create.html.php
+++ b/module/repo/view/create.html.php
@@ -75,8 +75,7 @@
             <td>
               <div class='input-group'>
                 <?php echo html::password('password', '', "class='form-control'");?>
-                <span class='input-group-addon fix-border fix-padding'></span>
-                <?php echo html::select('encrypt', $lang->repo->encryptList, 'base64', "class='form-control'");?>
+                <?php echo html::select('encrypt', $lang->repo->encryptList, 'base64', "class='form-control chosen'");?>
               </div>
             </td>
           </tr>
diff --git a/module/repo/view/edit.html.php b/module/repo/view/edit.html.php
index 6de3242b2a..31f5e558c3 100644
--- a/module/repo/view/edit.html.php
+++ b/module/repo/view/edit.html.php
@@ -79,8 +79,7 @@
             <td>
               <div class='input-group'>
                 <?php echo html::password('password', $repo->password, "class='form-control'");?>
-                <span class='input-group-addon fix-border fix-padding'></span>
-                <?php echo html::select('encrypt', $lang->repo->encryptList, $repo->encrypt, "class='form-control'");?>
+                <?php echo html::select('encrypt', $lang->repo->encryptList, $repo->encrypt, "class='form-control chosen'");?>
               </div>
             </td>
             <td></td>