From 8bfc6dec026808d454c9bc57ea582046d20d1977 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Mon, 13 Jun 2022 09:46:02 +0000
Subject: [PATCH] * Finish task#56558

---
 module/execution/control.php                 | 6 +++---
 module/execution/js/managemembers.js         | 2 +-
 module/execution/view/managemembers.html.php | 8 ++++----
 module/project/css/managemembers.css         | 3 +++
 module/project/view/managemembers.html.php   | 8 ++++----
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index c456b62e4a..93f062b932 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2736,8 +2736,8 @@ class execution extends control
         $this->loadModel('user');
         $this->loadModel('dept');
 
-        $execution   = $this->execution->getById($executionID);
-        $users     = $this->user->getPairs('noclosed|nodeleted|devfirst', '', $this->config->maxCount);
+        $execution = $this->execution->getById($executionID);
+        $users     = $this->user->getPairs('noclosed|nodeleted|devfirst');
         $roles     = $this->user->getUserRoles(array_keys($users));
         $deptUsers = empty($dept) ? array() : $this->dept->getDeptUserPairs($dept);
 
@@ -2752,7 +2752,7 @@ class execution extends control
         foreach($members2Import as $member) $appendUsers[$member->account] = $member->account;
         foreach($deptUsers as $deptAccount => $userName) $appendUsers[$deptAccount] = $deptAccount;
 
-        $users = $this->user->getPairs('noclosed|nodeleted|devfirst', $appendUsers, $this->config->maxCount);
+        $users = $this->user->getPairs('noclosed|nodeleted|devfirst', $appendUsers);
         $roles = $this->user->getUserRoles(array_keys($users));
 
         /* Set menu. */
diff --git a/module/execution/js/managemembers.js b/module/execution/js/managemembers.js
index 2bf74db218..a8d00e5b29 100644
--- a/module/execution/js/managemembers.js
+++ b/module/execution/js/managemembers.js
@@ -51,7 +51,7 @@ function addItem(obj)
 
     if($accounts.attr('data-pickertype') != 'remote')
     {
-        $accounts.chosen();
+        $accounts.picker({type: 'user'});
     }
     else
     {
diff --git a/module/execution/view/managemembers.html.php b/module/execution/view/managemembers.html.php
index a98bedd4d3..3a153e2096 100644
--- a/module/execution/view/managemembers.html.php
+++ b/module/execution/view/managemembers.html.php
@@ -68,7 +68,7 @@
 
         <?php foreach($members2Import as $member2Import):?>
         <tr class='addedItem'>
-          <td><?php echo html::select("accounts[]", $users, $member2Import->account, "class='form-control chosen' onchange='setRole(this.value, $i)'");?></td>
+          <td><?php echo html::select("accounts[]", $users, $member2Import->account, "class='form-control user-picker' onchange='setRole(this.value, $i)' data-max-list-count=" . $config->maxCount);?></td>
           <td><input type='text' name='roles[]' id='role<?php echo $i;?>' class='form-control' value='<?php echo $member2Import->role;?>' /></td>
           <td><input type='text' name='days[]'  id='days<?php echo $i;?>' class='form-control' value='<?php echo $execution->days?>'/></td>
           <td>
@@ -87,7 +87,7 @@
         <?php if(!isset($users[$deptAccount])) continue;?>
         <?php if(isset($members2Import[$deptAccount])) continue;?>
         <tr class='addedItem'>
-          <td><?php echo html::select("accounts[]", $users, $deptAccount, "class='form-control chosen' onchange='setRole(this.value, $i)'");?></td>
+          <td><?php echo html::select("accounts[]", $users, $deptAccount, "class='form-control user-picker' onchange='setRole(this.value, $i)' data-max-list-count=" . $config->maxCount);?></td>
           <td><input type='text' name='roles[]' id='role<?php echo $i;?>' class='form-control' value='<?php echo $roles[$deptAccount]?>'/></td>
           <td><input type='text' name='days[]'  id='days<?php echo $i;?>' class='form-control' value='<?php echo $execution->days?>'/></td>
           <td>
@@ -105,7 +105,7 @@
 
         <?php for($j = 0; $j < 5; $j ++):?>
         <tr class='addedItem'>
-          <td><?php echo html::select("accounts[]", $users, '', "class='form-control chosen' onchange='setRole(this.value, $i)'");?></td>
+          <td><?php echo html::select("accounts[]", $users, '', "class='form-control user-picker' onchange='setRole(this.value, $i)' data-max-list-count=" . $config->maxCount);?></td>
           <td><input type='text' name='roles[]' id='role<?php  echo ($i);?>' class='form-control' /></td>
           <td><input type='text' name='days[]'  id='days<?php  echo ($i);?>' class='form-control' value='<?php echo $execution->days?>'/></td>
           <td>
@@ -129,7 +129,7 @@
   <?php $i = '%i%';?>
   <table class='hidden'>
     <tr id='addItem' class='hidden'>
-      <td><?php echo html::select("accounts[]", $users, '', "class='form-control' onchange='setRole(this.value, $i)'");?></td>
+      <td><?php echo html::select("accounts[]", $users, '', "class='form-control' onchange='setRole(this.value, $i)'  data-max-list-count=" . $config->maxCount);?></td>
       <td><input type='text' name='roles[]' id='role<?php  echo ($i);?>' class='form-control' /></td>
       <td><input type='text' name='days[]'  id='days<?php  echo ($i);?>' class='form-control' value='<?php echo $execution->days?>'/></td>
       <td>
diff --git a/module/project/css/managemembers.css b/module/project/css/managemembers.css
index 0fc023b7d3..a085f61def 100644
--- a/module/project/css/managemembers.css
+++ b/module/project/css/managemembers.css
@@ -1,5 +1,8 @@
 #dept_chosen    .chosen-single {width: 220px;}
+#dept + .picker {width: 220px;}
 #project_chosen .chosen-single {width: 220px;}
+#project + .picker {width: 220px;}
+#mainMenu .picker-has-value {float: left;}
 .c-days {width: 100px;}
 .c-hours {width: 90px;}
 .c-limited {width: 110px;}
diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php
index fa8c5a6a1c..d53a62d57f 100644
--- a/module/project/view/managemembers.html.php
+++ b/module/project/view/managemembers.html.php
@@ -59,7 +59,7 @@
         <?php foreach($deptUsers as $deptAccount => $userName):?>
         <?php if(!isset($users[$deptAccount])) continue;?>
         <tr class='addedItem'>
-          <td><?php echo html::select("accounts[$i]", $users, $deptAccount, "class='form-control chosen' onchange='setRole(this.value, $i)'");?></td>
+          <td><?php echo html::select("accounts[$i]", $users, $deptAccount, "class='form-control user-picker' onchange='setRole(this.value, $i)' data-max-list-count=" . $config->maxCount);?></td>
           <td><?php echo html::input("roles[$i]", $roles[$deptAccount], "class='form-control'");?></td>
           <td><?php echo html::input("days[$i]", $project->days, "class='form-control'");?></td>
           <td><?php echo html::input("hours[$i]", $config->execution->defaultWorkhours, "class='form-control'");?></td>
@@ -76,7 +76,7 @@
         <?php foreach($members2Import as $member2Import):?>
         <?php if(!isset($users[$member2Import->account])) continue;?>
         <tr class='addedItem'>
-          <td><?php echo html::select("accounts[$i]", $users, $member2Import->account, "class='form-control user-picker' onchange='setRole(this.value, $i)'");?></td>
+          <td><?php echo html::select("accounts[$i]", $users, $member2Import->account, "class='form-control user-picker' onchange='setRole(this.value, $i)' data-max-list-count=" . $config->maxCount);?></td>
           <td><?php echo html::input("roles[$i]", $member2Import->role, "class='form-control'");?></td>
           <td><?php echo html::input("days[$i]", $project->days, "class='form-control'");?></td>
           <td><?php echo html::input("hours[$i]", $member2Import->hours, "class='form-control'");?></td>
@@ -92,7 +92,7 @@
 
         <?php for($j = 0; $j < 5; $j ++):?>
         <tr class='addedItem'>
-          <td><?php echo html::select("accounts[$i]", $users, '', "class='form-control user-picker' onchange='setRole(this.value, $i)'");?></td>
+          <td><?php echo html::select("accounts[$i]", $users, '', "class='form-control user-picker' onchange='setRole(this.value, $i)' data-max-list-count=" . $config->maxCount);?></td>
           <td><?php echo html::input("roles[$i]", '', "class='form-control'");?></td>
           <td><?php echo html::input("days[$i]", $project->days, "class='form-control'");?></td>
           <td><?php echo html::input("hours[$i]", $config->execution->defaultWorkhours, "class='form-control'");?></td>
@@ -132,7 +132,7 @@
   <?php $i = '%i%';?>
   <table class='hidden'>
     <tr id='addItem' class='hidden'>
-      <td><?php echo html::select("accounts[$i]", $users, '', "class='form-control' onchange='setRole(this.value, $i)'");?></td>
+      <td><?php echo html::select("accounts[$i]", $users, '', "class='form-control' onchange='setRole(this.value, $i)' data-max-list-count=" . $config->maxCount);?></td>
       <td><?php echo html::input("roles[$i]", '', "class='form-control'");?></td>
       <td><?php echo html::input("days[$i]", $project->days, "class='form-control'");?></td>
       <td><?php echo html::input("hours[$i]", $config->execution->defaultWorkhours, "class='form-control'");?></td>