From fcb699c84d7f1533760beb1aa62a62841692c335 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Thu, 6 Jan 2022 13:38:10 +0800
Subject: [PATCH] * Fix bug #18147,18149.

---
 module/execution/view/create.html.php     |  2 +-
 module/execution/view/edit.html.php       |  4 ++--
 module/my/view/buildcontactlists.html.php |  2 +-
 module/product/view/create.html.php       |  4 ++--
 module/product/view/edit.html.php         |  4 ++--
 module/program/view/create.html.php       |  2 +-
 module/program/view/edit.html.php         |  4 ++--
 module/project/view/create.html.php       |  2 +-
 module/project/view/edit.html.php         |  4 ++--
 module/user/control.php                   | 11 +++++++----
 www/js/my.full.js                         |  7 ++++---
 11 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index fd70afb68d..2fb95dbfc9 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -230,7 +230,7 @@
           <td colspan='2'>
             <div class='input-group'>
               <?php echo html::select('whitelist[]', $users, $whitelist, 'class="form-control chosen" multiple');?>
-              <?php echo $this->fetch('my', 'buildContactLists', "dropdownName='whitelist'");?>
+              <?php echo $this->fetch('my', 'buildContactLists', "dropdownName=whitelist");?>
             </div>
           </td>
         </tr>
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index b7ab279342..9adef799cb 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -191,10 +191,10 @@
         </tr>
         <tr class="<?php if($execution->acl == 'open') echo 'hidden';?>" id="whitelistBox">
           <th><?php echo $lang->whitelist;?></th>
-          <td>
+          <td colspan='1'>
             <div class='input-group'>
               <?php echo html::select('whitelist[]', $users, $execution->whitelist, 'class="form-control chosen" multiple');?>
-              <?php echo $this->fetch('my', 'buildContactLists', "dropdownName='whitelist'");?>
+              <?php echo $this->fetch('my', 'buildContactLists', "dropdownName=whitelist");?>
             </div>
           </td>
         </tr>
diff --git a/module/my/view/buildcontactlists.html.php b/module/my/view/buildcontactlists.html.php
index 61630b6d4c..4500d2b2bd 100644
--- a/module/my/view/buildcontactlists.html.php
+++ b/module/my/view/buildcontactlists.html.php
@@ -21,7 +21,7 @@ else
     echo '<a title="' . $lang->user->contacts->manage . '" href="' . $this->createLink('my', 'managecontacts', "listID=0&mode=new", '', true) . "\" target='_blank' data-icon='cog' data-title='{$lang->user->contacts->manage}' class='btn btn-icon iframe'><i class='icon icon-cog'></i></a>";
     echo '</span>';
     echo '<span class="input-group-btn">';
-    echo '<button type="button" title="' . $lang->refresh . '" class="btn btn-icon" onclick="ajaxGetContacts(this)"><i class="icon icon-refresh"></i></button>';
+    echo '<button type="button" title="' . $lang->refresh . '" class="btn btn-icon"' . "onclick=\"ajaxGetContacts(this, '$dropdownName')\"" . '><i class="icon icon-refresh"></i></button>';
     echo '</span>';
 }
 ?>
diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php
index 94d52e40dd..65a933dda1 100644
--- a/module/product/view/create.html.php
+++ b/module/product/view/create.html.php
@@ -104,10 +104,10 @@
           </tr>
           <tr id="whitelistBox">
             <th><?php echo $lang->whitelist;?></th>
-            <td colspan='2'>
+            <td colspan='1'>
               <div class='input-group'>
                 <?php echo html::select('whitelist[]', $users, '', 'class="form-control chosen" multiple');?>
-                <?php echo $this->fetch('my', 'buildContactLists', "dropdownName='whitelist'");?>
+                <?php echo $this->fetch('my', 'buildContactLists', "dropdownName=whitelist");?>
               </div>
             </td>
           </tr>
diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php
index b498923862..4a2c83b335 100644
--- a/module/product/view/edit.html.php
+++ b/module/product/view/edit.html.php
@@ -87,10 +87,10 @@
           </tr>
           <tr class="<?php if($product->acl == 'open') echo 'hidden';?>" id="whitelistBox">
             <th><?php echo $lang->whitelist;?></th>
-            <td>
+            <td colspan='1'>
               <div class='input-group'>
                 <?php echo html::select('whitelist[]', $users, $product->whitelist, 'class="form-control chosen" multiple');?>
-                <?php echo $this->fetch('my', 'buildContactLists', "dropdownName='whitelist'");?>
+                <?php echo $this->fetch('my', 'buildContactLists', "dropdownName=whitelist");?>
               </div>
             </td>
           </tr>
diff --git a/module/program/view/create.html.php b/module/program/view/create.html.php
index da9cf417b5..04043a5196 100644
--- a/module/program/view/create.html.php
+++ b/module/program/view/create.html.php
@@ -117,7 +117,7 @@
           <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'");?>
+              <?php echo $this->fetch('my', 'buildContactLists', "dropdownName=whitelist");?>
             </div>
           </td>
         </tr>
diff --git a/module/program/view/edit.html.php b/module/program/view/edit.html.php
index 71c144c8fa..397f6a5843 100644
--- a/module/program/view/edit.html.php
+++ b/module/program/view/edit.html.php
@@ -99,10 +99,10 @@
         </tr>
         <tr class="<?php if($program->acl == 'open') echo 'hidden';?>" id="whitelistBox">
           <th><?php echo $lang->whitelist;?></th>
-          <td>
+          <td colspan='2'>
             <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'");?>
+              <?php echo $this->fetch('my', 'buildContactLists', "dropdownName=whitelist");?>
             </div>
           </td>
         </tr>
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 012b3042d7..fa116889ba 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -162,7 +162,7 @@
           <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'");?>
+              <?php echo $this->fetch('my', 'buildContactLists', "dropdownName=whitelist");?>
             </div>
           </td>
         </tr>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index 821d72f72a..e8f430a273 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -176,10 +176,10 @@
         </tr>
         <tr class="<?php if($project->acl == 'open') echo 'hidden';?>" id="whitelistBox">
           <th><?php echo $lang->whitelist;?></th>
-          <td>
+          <td colspan='2'>
             <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'");?>
+              <?php echo $this->fetch('my', 'buildContactLists', "dropdownName=whitelist");?>
             </div>
           </td>
         </tr>
diff --git a/module/user/control.php b/module/user/control.php
index cefed1ae2a..b22f0ef256 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -1173,25 +1173,28 @@ class user extends control
     {
         $list = $contactListID ? $this->user->getContactListByID($contactListID) : '';
 
+        $class = $dropdownName == 'mailto' ? "data-placeholder='{$this->lang->chooseUsersToMail}'" : '';
+
         $users = $this->user->getPairs('devfirst|nodeleted', $list ? $list->userList : '', $this->config->maxCount);
         if(isset($this->config->user->moreLink)) $this->config->moreLinks[$dropdownName . "[]"] = $this->config->user->moreLink;
 
-        if(!$contactListID) return print(html::select($dropdownName . "[]", $users, '', "class='form-control chosen' multiple data-placeholder='{$this->lang->chooseUsersToMail}'"));
+        if(!$contactListID) return print(html::select($dropdownName . "[]", $users, '', "class='form-control chosen' multiple $class"));
 
-        return print(html::select($dropdownName . "[]", $users, $list->userList, "class='form-control chosen' multiple data-placeholder='{$this->lang->chooseUsersToMail}'"));
+        return print(html::select($dropdownName . "[]", $users, $list->userList, "class='form-control chosen' multiple $class"));
     }
 
     /**
      * Ajax get contact list.
      *
+     * @param  $dropdownName mailto|whitelist
      * @access public
      * @return string
      */
-    public function ajaxGetContactList()
+    public function ajaxGetContactList($dropdownName = 'mailto')
     {
         $contactList = $this->user->getContactLists($this->app->user->account, 'withnote');
         if(empty($contactList)) return false;
-        return print(html::select('', $contactList, '', "class='form-control' onchange=\"setMailto('mailto', this.value)\""));
+        return print(html::select('', $contactList, '', "class='form-control' onchange=\"setMailto('$dropdownName', this.value)\""));
     }
 
     /**
diff --git a/www/js/my.full.js b/www/js/my.full.js
index 7c91460e43..d8c2ca5693 100644
--- a/www/js/my.full.js
+++ b/www/js/my.full.js
@@ -162,13 +162,14 @@ function setMailto(mailto, contactListID)
 /**
  * Ajax get contacts.
  *
- * @param  obj $obj
+ * @param  object $obj
+ * @param  string $dropdownName mailto|whitelist
  * @access public
  * @return void
  */
-function ajaxGetContacts(obj)
+function ajaxGetContacts(obj, dropdownName = 'mailto')
 {
-    link = createLink('user', 'ajaxGetContactList');
+    link = createLink('user', 'ajaxGetContactList', 'dropdownName=' + dropdownName);
     $.get(link, function(contacts)
     {
         if(!contacts) return false;