* Fix bug #16389,#16387.

This commit is contained in:
liyuchun
2021-11-18 22:54:48 +08:00
parent 8980685d6b
commit d188fbd7b8
3 changed files with 8 additions and 6 deletions
+5 -3
View File
@@ -45,6 +45,8 @@ html[lang='en'] #deadlineTd .input-group-addon {padding: 5px 18px;}
#osBox .required:after {right: 1px;}
#osBox {width: 190px;}
#projectBox .required:after {right: 1px;}
#assignedTo_chosen {width: 153px !important; float: left;}
#assignedBox .load-all-user {float: left;}
#assignedBox .load-all-user .btn {border-left: none;}
#assignedTo_chosen, .load-all-user {float: left;;}
.assigned-box #assignedTo_chosen {width: 81% !important;}
.deadline-box #assignedTo_chosen {width: 153px !important;}
.assigned-box .load-all-user {float: left;}
.assigned-box .load-all-user .btn {border-left: none;}
+2 -2
View File
@@ -130,11 +130,11 @@ js::set('moduleID', $moduleID);
<th><nobr><?php echo $lang->bug->lblAssignedTo;?></nobr></th>
<td>
<div class='table-row'>
<div class='table-col' id='assignedBox'>
<?php $showDeadline = strpos(",$showFields,", ',deadline,') !== false;?>
<div class='table-col <?php echo $showDeadline ? 'deadline-box' : 'assigned-box';?>'>
<?php echo html::select('assignedTo', $productMembers, $assignedTo, "class='form-control chosen'");?>
<span class='input-group-btn load-all-user'><?php echo html::commonButton($lang->bug->allUsers, "class='btn btn-default' onclick='loadAllUsers()' data-toggle='tooltip'");?></span>
</div>
<?php $showDeadline = strpos(",$showFields,", ',deadline,') !== false;?>
<?php if($showDeadline):?>
<div class='table-col'>
<div class='input-group' id='deadlineBox'>
+1 -1
View File
@@ -607,7 +607,7 @@ class personnelModel extends model
if($oldWhitelist) $accounts = array_unique(array_merge($accounts, $oldWhitelist));
}
}
$whitelist = ',' . implode(',', $accounts);
$whitelist = !empty($accounts) ? ',' . implode(',', $accounts) : '';
$this->dao->update($objectTable)->set('whitelist')->eq($whitelist)->where('id')->eq($objectID)->exec();
$deletedAccounts = array();