Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms

module/task/control.php

@@ -487,7 +487,7 @@ class task extends control
         if($executionID)
         {
             $execution = $this->execution->getById($executionID);
-            $this->execution->setMenu($this->execution->getPairs(), $execution->id);
+            $this->execution->setMenu($execution->id);
 
             /* Set modules and members. */
             $showAllModule = isset($this->config->task->allModule) ? $this->config->task->allModule : '';

module/task/model.php

@@ -935,7 +935,7 @@ class taskModel extends model
             foreach($teams as $member) $this->dao->insert(TABLE_TEAM)->data($member)->autoCheck()->exec();
 
             /* Assign the left hours to zero who will be skipped. */
-            $skipMembers = $this->loadModel('execution')->getTeamSkip($oldTask->team, $oldTask->assignedTo, $task->assignedTo);
+            $skipMembers = $this->loadModel('execution')->getTeamSkip($oldTask->team, $oldTask->assignedTo, isset($task->assignedTo) ? $task->assignedTo : $oldTask->assignedTo);
             foreach($skipMembers as $account => $team) $this->dao->update(TABLE_TEAM)->set('left')->eq(0)->where('root')->eq($taskID)->andWhere('type')->eq('task')->andWhere('account')->eq($account)->exec();
 
             $task = $this->computeHours4Multiple($oldTask, $task, array(), $autoStatus = false);

module/task/view/batchedit.html.php

@@ -92,7 +92,7 @@ js::set('dittoNotice', $dittoNotice);
             <?php
             $members      = array('' => '', 'ditto' => $this->lang->task->ditto);
             $teamAccounts = !empty($executionTeams[$tasks[$taskID]->execution]) ? array_keys($executionTeams[$tasks[$taskID]->execution]) : array();
-            foreach($teamAccounts as $teamAccount) $members[$teamAccount] = $users[$teamAccount];
+            foreach($teamAccounts as $teamAccount) $members[$teamAccount] = zget($users, $teamAccount);
             $members['closed'] = 'Closed';
 
             $taskMembers = array();