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

- Delete duplicate code.

Browse Source
This commit is contained in:
caoyanyi
2024-01-03 18:59:54 +08:00
parent 71c6eaac6c
commit b0615d06b4
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/config/form.php
+2 -1
View File
@@ -75,7 +75,8 @@ $config->task->form->edit['closedBy'] = array('type' => 'string', 'requi
$config->task->form->edit['closedReason'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->task->form->edit['closedDate'] = array('type' => 'datetime', 'required' => false, 'default' => null);
$config->task->form->edit['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->task->form->edit['lastEditedDate'] = array('type' => 'datetime', 'required' => false, 'default' => null);
$config->task->form->edit['lastEditedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->task->form->edit['deleteFiles'] = array('type' => 'array', 'required' => false, 'default' => array());
$config->task->form->team->create = array();
$config->task->form->team->create['team'] = array('type' => 'array', 'required' => false, 'default' => array());
module/task/zen.php
+2 -4
View File
@@ -432,9 +432,8 @@ class taskZen extends task
if(dao::isError()) return false;
$now = helper::now();
$task = form::data($this->config->task->form->edit)->add('id', $task->id)
->setDefault('deleteFiles', array())
->add('lastEditedDate', $now)
$task = form::data($this->config->task->form->edit)
->add('id', $task->id)
->setIF(!$task->assignedTo && !empty($oldTask->team) && !empty($this->post->team), 'assignedTo', $this->task->getAssignedTo4Multi($this->post->team, $oldTask))
->setIF($task->assignedTo != $oldTask->assignedTo, 'assignedDate', $now)
->setIF($task->mode == 'single', 'mode', '')
@@ -456,7 +455,6 @@ class taskZen extends task
->setIF($oldTask->parent < 0, 'left', $oldTask->left)
->setIF($oldTask->name != $task->name || $oldTask->estStarted != $task->estStarted || $oldTask->deadline != $task->deadline, 'version', $oldTask->version + 1)
->stripTags($this->config->task->editor->edit['id'], $this->config->allowedTags)
->join('mailto', ',')
->get();
return $this->loadModel('file')->processImgURL($task, $this->config->task->editor->edit['id'], (string)$this->post->uid);