* Fix bug #20743,#20209.
This commit is contained in:
@@ -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');
|
||||
|
||||
@@ -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;}
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user