diff --git a/module/release/model.php b/module/release/model.php index a11b44f7dd..f829bb869a 100644 --- a/module/release/model.php +++ b/module/release/model.php @@ -125,13 +125,15 @@ class releaseModel extends model } else { - $build = fixer::input('post') - ->add('product', (int)$productID) - ->add('builder', $this->app->user->account) - ->add('branch', $branch) - ->stripTags($this->config->release->editor->create['id'], $this->config->allowedTags) - ->remove('marker,build,files,labels,uid,subStatus') // There is the subStatus field in the biz version. - ->get(); + $build = new stdclass(); + $build->product = (int)$productID; + $build->branch = (int)$branch; + $build->name = $this->post->name; + $build->date = $this->post->date; + $build->builder = $this->app->user->account; + $build->desc = $this->post->desc; + $build->project = 0; + $build = $this->loadModel('file')->processImgURL($build, $this->config->release->editor->create['id']); $this->dao->insert(TABLE_BUILD)->data($build) ->autoCheck() diff --git a/module/task/model.php b/module/task/model.php index f4ac1c57f0..729635dc15 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1125,12 +1125,13 @@ class taskModel extends model } /* Record consumed and left. */ - $estimate = fixer::input('post') - ->setDefault('account', $this->app->user->account) - ->setDefault('task', $taskID) - ->setDefault('date', $task->realStarted) - ->remove('realStarted,comment,status') - ->get(); + $estimate = new stdclass(); + $estimate->date = zget($task, 'realStarted', date(DT_DATE1)); + $estimate->task = $taskID; + $estimate->consumed = zget($task, 'consumed', 0); + $estimate->left = zget($task, 'left', 0); + $estimate->work = zget($task, 'work', ''); + $estimate->account = $this->app->user->account; $estimate->consumed = $estimate->consumed - $oldTask->consumed; $this->addTaskEstimate($estimate); @@ -1349,14 +1350,13 @@ class taskModel extends model } } - $estimate = fixer::input('post') - ->setDefault('account', $this->app->user->account) - ->setDefault('task', $taskID) - ->setDefault('date', date(DT_DATE1)) - ->setIF($this->post->finishedDate, 'date', $this->post->finishedDate) - ->setDefault('left', 0) - ->remove('finishedDate,comment,assignedTo,files,labels,consumed,currentConsumed,status') - ->get(); + $estimate = new stdclass(); + $estimate->date = zget($task, 'finishedDate', date(DT_DATE1)); + $estimate->task = $taskID; + $estimate->consumed = zget($task, 'consumed', 0); + $estimate->left = zget($task, 'left', 0); + $estimate->work = zget($task, 'work', ''); + $estimate->account = $this->app->user->account; $estimate->consumed = $consumed; if($estimate->consumed) $this->addTaskEstimate($estimate);