Merge branch 'sprint/task_zhouxudong_48844' into 'master'

Sprint/task zhouxudong 48844

See merge request easycorp/zentaopms!1795
This commit is contained in:
李玉春
2022-02-15 05:05:31 +00:00
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -1366,7 +1366,7 @@ class bugModel extends model
{
$bug = $this->getById($bugID);
$bugIDList = $bug->id . ',' . $bug->linkBug;
$bugs2Link = $this->getBySearch($bug->product, 'all', $queryID, 'id', $bugIDList ,$pager);
$bugs2Link = $this->getBySearch($bug->product, 'all', $queryID, 'id', $bugIDList, $pager);
return $bugs2Link;
}
else
+1
View File
@@ -32,6 +32,7 @@
.modal-iframe .modal-content .modal-header .modal-title .icon-eye-open {display: none;}
.modal-iframe .modal-content .modal-header .modal-title a.btn {border-color: transparent; background: none; padding: 0px; border-radius: 2px; color: #036; padding: 4px 7px;}
.modal-iframe .modal-content .modal-header .modal-title a.btn .icon-eye-open {display: inline;}
.modal-iframe .modal-header .close {top: 17px !important;}
.input-group-btn.goback {padding-left: 10px;}
.input-group-btn.select {min-width: 60px; margin-left: -2px;}
.input-group .chosen-container {min-width: 250px;}