Merge branch '180'

module/program/model.php

@@ -593,7 +593,7 @@ class programModel extends model
             ->add('type', 'program')
             ->join('whitelist', ',')
             ->stripTags($this->config->program->editor->create['id'], $this->config->allowedTags)
-            ->remove('delta,future')
+            ->remove('delta,future,contactListMenu')
             ->get();
 
         if($program->parent)
@@ -678,7 +678,7 @@ class programModel extends model
             ->setIF(!isset($this->post->budgetUnit), 'budgetUnit', $oldProgram->budgetUnit)
             ->join('whitelist', ',')
             ->stripTags($this->config->program->editor->edit['id'], $this->config->allowedTags)
-            ->remove('uid,delta,future,syncPRJUnit,exchangeRate')
+            ->remove('uid,delta,future,syncPRJUnit,exchangeRate,contactListMenu')
             ->get();
 
         $program  = $this->loadModel('file')->processImgURL($program, $this->config->program->editor->edit['id'], $this->post->uid);

module/program/view/create.html.php

@@ -114,9 +114,12 @@
         </tr>
         <tr id="whitelistBox">
           <th><?php echo $lang->whitelist;?></th>
-          <td><?php echo html::select('whitelist[]', $users, '', 'class="form-control chosen" multiple');?></td>
-          <td></td>
-          <td></td>
+          <td colspan='2'>
+            <div class='input-group'>
+              <?php echo html::select('whitelist[]', $users, '', 'class="form-control chosen" multiple');?>
+              <?php echo $this->fetch('my', 'buildContactLists', "dropdownName='whitelist'");?>
+            </div>
+          </td>
         </tr>
         <tr>
           <td colspan='4' class='text-center form-actions'>

module/program/view/edit.html.php

@@ -99,9 +99,12 @@
         </tr>
         <tr class="<?php if($program->acl == 'open') echo 'hidden';?>" id="whitelistBox">
           <th><?php echo $lang->whitelist;?></th>
-          <td><?php echo html::select('whitelist[]', $users, $program->whitelist, 'class="form-control chosen" multiple');?></td>
-          <td></td>
-          <td></td>
+          <td>
+            <div class='input-group'>
+              <?php echo html::select('whitelist[]', $users, $program->whitelist, 'class="form-control chosen" multiple');?>
+              <?php echo $this->fetch('my', 'buildContactLists', "dropdownName='whitelist'");?>
+            </div>
+          </td>
         </tr>
         <tr>
           <td colspan='4' class='text-center form-actions'>