Merge branch '180'

2022-01-04 22:41:23 +08:00
parent a2bd7cfcf3 44b222eca6
commit c8db935f34
84 changed files with 627 additions and 253 deletions
@@ -176,9 +176,12 @@
        </tr>
        <tr class="<?php if($project->acl == 'open') echo 'hidden';?>" id="whitelistBox">
          <th><?php echo $lang->whitelist;?></th>
-          <td><?php echo html::select('whitelist[]', $users, $project->whitelist, 'class="form-control chosen" multiple');?></td>
-          <td></td>
-          <td></td>
+          <td>
+            <div class='input-group'>
+              <?php echo html::select('whitelist[]', $users, $project->whitelist, 'class="form-control chosen" multiple');?>
+              <?php echo $this->fetch('my', 'buildContactLists', "dropdownName='whitelist'");?>
+            </div>
+          </td>
        </tr>
        <tr>
          <th><?php echo $lang->project->auth;?></th>