From 1d3e3d11e762b22cd40202d2fa6d5d6335abeb7a Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Fri, 28 Jun 2019 09:19:45 +0800
Subject: [PATCH] * Finish task #5856.

---
 module/project/js/managemembers.js         |  2 +-
 module/project/model.php                   | 26 +++++++---------------
 module/project/view/managemembers.html.php |  6 +----
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/module/project/js/managemembers.js b/module/project/js/managemembers.js
index 82257a19d8..ad634b0871 100644
--- a/module/project/js/managemembers.js
+++ b/module/project/js/managemembers.js
@@ -25,7 +25,7 @@ function addItem(obj)
 
 function deleteItem(obj)
 {
-    $(obj).closest('.addedItem').remove();
+    $(obj).closest('tr').remove();
 }
 
 function setDeptUsers(obj)
diff --git a/module/project/model.php b/module/project/model.php
index 0d2f9ee237..52bb9b61a2 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1752,6 +1752,8 @@ class projectModel extends model
         extract($data);
 
         $accounts = array_unique($accounts);
+        $limited  = array_values($limited);
+        $this->dao->delete()->from(TABLE_TEAM)->where('root')->eq((int)$projectID)->andWhere('type')->eq('project')->exec();
         foreach($accounts as $key => $account)
         {
             if(empty($account)) continue;
@@ -1762,24 +1764,12 @@ class projectModel extends model
             $member->hours   = $hours[$key];
             $member->limited = $limited[$key];
 
-            $mode = $modes[$key];
-            if($mode == 'update')
-            {
-                $this->dao->update(TABLE_TEAM)
-                    ->data($member)
-                    ->where('root')->eq((int)$projectID)
-                    ->andWhere('type')->eq('project')
-                    ->andWhere('account')->eq($account)
-                    ->exec();
-            }
-            else
-            {
-                $member->root    = (int)$projectID;
-                $member->account = $account;
-                $member->join    = helper::today();
-                $member->type    = 'project';
-                $this->dao->insert(TABLE_TEAM)->data($member)->exec();
-            }
+            $member->root    = (int)$projectID;
+            $member->account = $account;
+            $member->join    = helper::today();
+            $member->type    = 'project';
+
+            $this->dao->insert(TABLE_TEAM)->data($member)->exec();
         }
         $this->loadModel('user')->updateUserView($projectID, 'project', $accounts);
 
diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php
index 27d9b26f49..08817c95ca 100644
--- a/module/project/view/managemembers.html.php
+++ b/module/project/view/managemembers.html.php
@@ -53,12 +53,12 @@
           <td><input type='text' name='days[] '     id='days<?php echo $i;?>'    value='<?php echo $member->days;?>' class='form-control' /></td>
           <td>
             <input type='text'   name='hours[]' id='hours<?php echo $i;?>' value='<?php echo $member->hours;?>' class='form-control' />
-            <input type='hidden' name='modes[]' value='update' />
             <input type='hidden' name='accounts[]' value='<?php echo $member->account;?>' />
           </td>
           <td><?php echo html::radio("limited[$i]", $lang->team->limitedList, $member->limited);?></td>
           <td class='c-actions'>
             <a href='javascript:;' onclick='addItem(this)' class='btn btn-link'><i class='icon-plus'></i></a>
+            <a href='javascript:;' onclick='deleteItem(this)' class='btn btn-link'><i class='icon icon-close'></i></a>
           </td>
         </tr>
         <?php $i ++; $memberCount ++;?>
@@ -71,7 +71,6 @@
           <td><input type='text' name='days[]'  id='days<?php echo $i;?>' class='form-control' value='<?php echo $project->days?>'/></td>
           <td>
             <input type='text'   name='hours[]' id='hours<?php echo $i;?>' class='form-control' value='<?php echo $member2Import->hours;?>' />
-            <input type='hidden' name='modes[]' value='create' />
           </td>
           <td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td>
           <td class='c-actions'>
@@ -90,7 +89,6 @@
           <td><input type='text' name='days[]'  id='days<?php echo $i;?>' class='form-control' value='<?php echo $project->days?>'/></td>
           <td>
             <input type='text'   name='hours[]' id='hours<?php echo $i;?>' class='form-control' value='<?php echo $config->project->defaultWorkhours?>' />
-            <input type='hidden' name='modes[]' value='create' />
           </td>
           <td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td>
           <td class='c-actions'>
@@ -109,7 +107,6 @@
           <td><input type='text' name='days[]'  id='days<?php  echo ($i);?>' class='form-control' value='<?php echo $project->days?>'/></td>
           <td>
             <input type='text'   name='hours[]' id='hours<?php echo ($i);?>' class='form-control' value='<?php echo $config->project->defaultWorkhours?>' />
-            <input type='hidden' name='modes[]' value='create' />
           </td>
           <td><?php echo html::radio("limited[$i]", $lang->team->limitedList, 'no');?></td>
           <td class='c-actions'>
@@ -134,7 +131,6 @@
       <td><input type='text' name='days[]'  id='days<?php  echo ($i);?>' class='form-control' value='<?php echo $project->days?>'/></td>
       <td>
         <input type='text'   name='hours[]' id='hours<?php echo ($i);?>' class='form-control' value='<?php echo $config->project->defaultWorkhours?>' />
-        <input type='hidden' name='modes[]' value='create' />
       </td>
       <td><?php echo html::radio("limited[$i]", $lang->team->limitedList, $member->realname ? $member->limited : 'no');?></td>
       <td class='c-actions'>