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

Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
xushenjie
2023-05-06 01:19:04 +00:00
parent eb0f96c4e0 5cb75109a8
commit 4bb5172af4
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/config/form.php
+5
View File
@@ -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' => '');
module/project/zen.php
+4 -1
View File
@@ -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();