This commit is contained in:
tianshujie
2021-09-02 13:02:26 +08:00
parent 8f9a010887
commit 6f7835da43
4 changed files with 4 additions and 3 deletions
-1
View File
@@ -27,4 +27,3 @@
#whitelistBox .checkbox-inline, #whitelistBox .radio-inline {margin-left: 10px; display: inline-block; padding-left: 0px; padding-right: 10px;}
.main-table > .table-responsive {padding: 0 1px; background: #fff;}
#teams_chosen ul li:first-child {max-width:256px; display: inline-block; vertical-align: middle;}
-1
View File
@@ -14,5 +14,4 @@
.checkbox input[type=checkbox], .checkbox-inline input[type=checkbox], .radio input[type=radio], .radio-inline input[type=radio] {margin-top: 1px;}
#lifeTimeTips {display: none;}
#teams_chosen ul > li:first-child {max-width: 425px;}
#teams_chosen ul .label {margin-top: 3px;}
+3
View File
@@ -48,8 +48,11 @@ $(function()
{
if(systemMode == 'new')
{
var maxWidth = $('.chosen-container .chosen-drop.chosen-auto-max-width.in').width() - 70;
$('#teams_chosen ul .label').remove();
$('#teams_chosen ul li:first').after(' <label class="label">' + projectCommon + '</label>');
$('#teams_chosen ul > li:first').attr('style', 'display: inline-block; vertical-align: middle; max-width: ' + maxWidth + 'px');
}
})
+1 -1
View File
@@ -2448,7 +2448,7 @@ class executionModel extends model
*/
public function getTeamPairsByProject($projectID = 0)
{
if(empty($projectID)) return array();
if(empty($projectID) and $this->config->systemMode == 'new') return array();
$teams = $this->dao->select('id,name,type')->from(TABLE_PROJECT)
->where('deleted')->eq(0)