Merge branch 'sprint/task_zhouxudong_48844' into 'master'
Sprint/task zhouxudong 48844 See merge request easycorp/zentaopms!1795
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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;}
|
||||
|
||||
Reference in New Issue
Block a user