diff --git a/module/project/config/form.php b/module/project/config/form.php index c5ca91565f..2970993058 100644 --- a/module/project/config/form.php +++ b/module/project/config/form.php @@ -46,3 +46,8 @@ $config->project->form->edit['product'] = array('type' => 'array', 'required $config->project->form->start['realBegan'] = array('type' => 'date', 'required' => true, 'filter' => 'trim'); $config->project->form->close['realEnd'] = array('type' => 'date', 'required' => true, 'filter' => 'trim'); + +$config->project->form->activate['begin'] = array('type' => 'date', 'required' => true); +$config->project->form->activate['end'] = array('type' => 'date', 'required' => true); +$config->project->form->activate['readjustTime'] = array('type' => 'int', 'required' => false, 'default' => ''); +$config->project->form->activate['readjustTask'] = array('type' => 'array', 'required' => false, 'default' => ''); diff --git a/module/project/zen.php b/module/project/zen.php index 205d8e7ffd..f3543af4a8 100644 --- a/module/project/zen.php +++ b/module/project/zen.php @@ -569,7 +569,7 @@ class projectZen extends project { if($this->post->comment != '' or !empty($changes)) { - $actionID = $this->action->create('project', $projectID, 'Activated', $this->post->comment); + $actionID = $this->loadModel('action')->create('project', $projectID, 'Activated', $this->post->comment); $this->action->logHistory($actionID, $changes); } @@ -587,6 +587,7 @@ class projectZen extends project */ protected function prepareActivateExtras(int $projectID, object $postData): object { + $rawdata = $postData->rawdata; $oldProject = $this->project->getByID($projectID); $editorIdList = $this->config->project->editor->activate['id']; @@ -595,6 +596,8 @@ class projectZen extends project ->setDefault('status', 'doing') ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', helper::now()) + ->setIF($rawdata->begin == '0000-00-00', 'begin', '') + ->setIF($rawdata->end == '0000-00-00', 'end', '') ->setIF(!helper::isZeroDate($oldProject->realBegan), 'realBegan', helper::today()) ->stripTags($editorIdList, $this->config->allowedTags) ->get();