diff --git a/module/project/model.php b/module/project/model.php index be94a033cf..d4b5273954 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -340,6 +340,8 @@ class projectModel extends model $project = fixer::input('post') ->setDefault('status', 'wait') ->setIF($this->post->acl != 'custom', 'whitelist', '') + ->setDefault('openedBy', $this->app->user->account) + ->setDefault('openedDate', helper::now()) ->setDefault('openedVersion', $this->config->version) ->setDefault('team', substr($this->post->name,0, 30)) ->join('whitelist', ',') diff --git a/module/task/model.php b/module/task/model.php index c094b66480..b743f6f287 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1074,18 +1074,30 @@ class taskModel extends model ->remove('comment,files,labels') ->get(); - if(!is_numeric($task->consumed)) die(js::error($this->lang->task->error->consumedNumber)); + if(!is_numeric($task->consumed)) + { + dao::$errors[] = $this->lang->task->error->consumedNumber; + return false; + } /* Record consumed and left. */ if(empty($oldTask->team)) { $consumed = $task->consumed - $oldTask->consumed; - if($consumed < 0) die(js::error($this->lang->task->error->consumedSmall)); + if($consumed < 0) + { + dao::$errors[] = $this->lang->task->error->consumedSmall; + return false; + } } else { $consumed = $oldTask->team[$this->app->user->account]->consumed; - if($task->consumed < $consumed) die(js::error($this->lang->task->error->consumedSmall)); + if($task->consumed < $consumed) + { + dao::$errors[] = $this->lang->task->error->consumedSmall; + return false; + } } $estimate = fixer::input('post')