* Code for task #41238.

module/project/control.php

@@ -189,6 +189,7 @@ class project extends control
             ->andWhere('t1.type')->eq('execution')
             ->andWhere('t1.account')->eq($account)
             ->fetchPairs();
+        if(empty($executionMembers)) die();
 
         $executionNames = '';
         $count          = 0;
@@ -200,7 +201,14 @@ class project extends control
             $count++;
         }
         if(count($executionMembers) <= 2) $this->lang->project->etc = ' ';
-        $this->lang->project->unlinkExecutionMember = sprintf($this->lang->project->unlinkExecutionMember, $executionNames, $this->lang->project->etc, count($executionMembers));
+        if(strpos($this->app->getClientLang(), 'zh') !== false)
+        {
+            $this->lang->project->unlinkExecutionMember = sprintf($this->lang->project->unlinkExecutionMember, $executionNames, $this->lang->project->etc, count($executionMembers));
+        }
+        else
+        {
+            $this->lang->project->unlinkExecutionMember = sprintf($this->lang->project->unlinkExecutionMember, count($executionMembers), $executionNames, $this->lang->project->etc);
+        }
         die($this->lang->project->unlinkExecutionMember);
     }
 

module/project/js/team.js

@@ -20,13 +20,20 @@ function deleteMemeber(projectID, account, userID)
         var tipsLink      = createLink('project', 'ajaxGetUnlinkTips', 'projectID=' + projectID + '&account=' + account);
         $.get(tipsLink, function(tips)
         {
-            if(confirm(tips))
+            if(!tips)
             {
-                var unlinkURL = createLink('project', 'unlinkMember', 'projectID=' + projectID + '&userID=' + userID + '&confirm=yes&removeExecution=yes');
+                var unlinkURL = createLink('project', 'unlinkMember', 'projectID=' + projectID + '&userID=' + userID + '&confirm=yes&removeExecution=no');
             }
             else
             {
-                var unlinkURL = createLink('project', 'unlinkMember', 'projectID=' + projectID + '&userID=' + userID + '&confirm=yes&removeExecution=no');
+                if(confirm(tips))
+                {
+                    var unlinkURL = createLink('project', 'unlinkMember', 'projectID=' + projectID + '&userID=' + userID + '&confirm=yes&removeExecution=yes');
+                }
+                else
+                {
+                    var unlinkURL = createLink('project', 'unlinkMember', 'projectID=' + projectID + '&userID=' + userID + '&confirm=yes&removeExecution=no');
+                }
             }
 
             $.get(unlinkURL, function(data)

module/project/lang/en.php

@@ -129,6 +129,7 @@ $lang->project->longTime           = 'Long-Term Program';
 $lang->project->future             = 'TBD';
 $lang->project->moreProject        = 'More Project';
 $lang->project->days               = 'Available Days';
+$lang->project->etc                = " , etc";
 
 $lang->project->productNotEmpty        = 'Please link products or create products.';
 $lang->project->existProductName       = 'Product name already exists.';
@@ -138,6 +139,7 @@ $lang->project->linkedProjectsTip      = 'Linked projects are as follows';
 $lang->project->multiLinkedProductsTip = 'The following products linked to this project are also linked to other projects, please unlink before proceeding.';
 $lang->project->linkStoryByPlanTips    = "This action will associate all {$lang->SRCommon} under the selected plan to this project";
 $lang->project->createExecution        = "There is no {$lang->executionCommon} under this project, please create {$lang->executionCommon} first";
+$lang->project->unlinkExecutionMember  = "The user participated in %s executions such as %s%s. Do you want to remove the user from those executions as well? (The data related to this user will not be deleted.)";
 
 $lang->project->tenThousand = '';
 

module/project/lang/zh-cn.php

@@ -139,7 +139,7 @@ $lang->project->linkedProjectsTip      = '关联的项目如下';
 $lang->project->multiLinkedProductsTip = '该项目关联的如下产品还关联了其他项目，请取消关联后再操作';
 $lang->project->linkStoryByPlanTips    = "此操作会将所选计划下面的{$lang->SRCommon}全部关联到此项目中";
 $lang->project->createExecution        = "该项目下没有{$lang->executionCommon}，请先创建{$lang->executionCommon}";
-$lang->project->unlinkExecutionMember  = "该用户参与了%s%s%s个{$lang->executionCommon}，是否同时将其移除？（该用户所产生的数据不会受影响。）";
+$lang->project->unlinkExecutionMember  = "该用户参与了%s%s%s个{$lang->execution->common}，是否同时将其移除？（该用户所产生的数据不会受影响。）";
 
 $lang->project->tenThousand = '万';