From 85987eee805d2422059128e811c1caa65d24b274 Mon Sep 17 00:00:00 2001 From: zhujinyong Date: Sat, 2 Mar 2013 14:04:28 +0000 Subject: [PATCH] * change 'record' to 'recordEstimate'. --- module/task/control.php | 4 ++-- module/task/model.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/task/control.php b/module/task/control.php index 9a9f36f1ee..f63d09eef1 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -431,13 +431,13 @@ class task extends control * @access public * @return void */ - public function record($taskID) + public function recordEstimate($taskID) { $this->commonAction($taskID); if(!empty($_POST)) { - $this->task->record($taskID); + $this->task->recordEstimate($taskID); if(isonlybody()) die(js::reload('parent.parent')); die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent')); } diff --git a/module/task/model.php b/module/task/model.php index 9a740e2512..2b75ea6161 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -415,7 +415,7 @@ class taskModel extends model * @access public * @return void */ - public function record($taskID) + public function recordEstimate($taskID) { $record = fixer::input('post')->get(); $estimates = array(); @@ -444,7 +444,7 @@ class taskModel extends model ->autoCheck() ->exec(); $estimateID = $this->dao->lastInsertID(); - $this->loadModel('action')->create('task', $taskID, 'Recorded', '', $estimate->consumed); + $this->loadModel('action')->create('task', $taskID, 'RecordEstimate', '', $estimate->consumed); } $this->dao->update(TABLE_TASK) @@ -888,7 +888,7 @@ class taskModel extends model $this->dao->delete()->from(TABLE_TASKESTIMATE)->where('id')->eq($estimateID)->exec(); $lastEstimate = $this->dao->select('*')->from(TABLE_TASKESTIMATE)->where('task')->eq($estimate->task)->orderBy('id desc')->fetch(); $this->dao->update(TABLE_TASK)->set("consumed = consumed - {$estimate->consumed}")->set('`left`')->eq($lastEstimate->left)->where('id')->eq($estimate->task)->exec(); - $this->loadModel('action')->create('task', $oldEstimate->task, 'DelEstimate'); + $this->loadModel('action')->create('task', $oldEstimate->task, 'DeleteEstimate'); } /**