Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2017-11-01 13:28:14 +08:00
parent 8000d57e9d 0b90bae736
commit d4dd502c31
58 changed files with 805 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+6 -6
View File
@@ -124,7 +124,7 @@ class taskModel extends model
$team->task = $taskID;
$this->dao->insert(TABLE_TEAM)->data($team)->autoCheck()->exec();
}
$this->loadModel('score')->score('task', 'create', $taskID);
$this->loadModel('score')->create('task', 'create', $taskID);
$tasksID[$assignedTo] = array('status' => 'created', 'id' => $taskID);
}
return $tasksID;
@@ -224,14 +224,14 @@ class taskModel extends model
$taskID = $this->dao->lastInsertID();
if($story) $this->story->setStage($tasks->story[$i]);
$actionID = $this->action->create('task', $taskID, 'Opened', '');
$this->loadModel('score')->score('task', 'create', $taskID);
$this->loadModel('score')->create('task', 'create', $taskID);
$mails[$i] = new stdclass();
$mails[$i]->taskID = $taskID;
$mails[$i]->actionID = $actionID;
}
$this->countTime($tasks->parent[0]);
$this->loadModel('score')->score('ajax', 'batchCreate');
$this->loadModel('score')->create('ajax', 'batchCreate');
return $mails;
}
@@ -600,7 +600,7 @@ class taskModel extends model
die(js::error('task#' . $taskID . dao::getError(true)));
}
}
$this->loadModel('score')->score('ajax', 'batchEdit');
$this->loadModel('score')->create('ajax', 'batchEdit');
return $allChanges;
}
@@ -885,7 +885,7 @@ class taskModel extends model
$this->countTime($oldTask->parent);
if($oldTask->story) $this->loadModel('story')->setStage($oldTask->story);
$this->loadModel('score')->score('task', 'finish', $taskID);
$this->loadModel('score')->create('task', 'finish', $taskID);
if(!dao::isError()) return common::createChanges($oldTask, $task);
}
@@ -940,7 +940,7 @@ class taskModel extends model
$data = new stdClass();
$data->status = 'closed';
$this->dao->update(TABLE_TASK)->data($data)->autoCheck()->where('parent')->eq($taskID)->exec();
$this->loadModel('score')->score('task', 'close', $taskID);
$this->loadModel('score')->create('task', 'close', $taskID);
if($oldTask->story) $this->loadModel('story')->setStage($oldTask->story);
if(!dao::isError()) return common::createChanges($oldTask, $task);
}