diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index f9341a5dbe..dcd020b3e7 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -31,9 +31,9 @@
todo->desc;
- if($todo->type == 'bug') common::printLink('bug', 'view', "id={$todo->idvalue}", ' BUG#' . $todo->idvalue);
- if($todo->type == 'task') common::printLink('task', 'view', "id={$todo->idvalue}", ' TASK#' . $todo->idvalue);
- if($todo->type == 'story') common::printLink('story', 'view', "id={$todo->idvalue}", ' STORY#' . $todo->idvalue);
+ if($todo->type == 'bug') common::printLink('bug', 'view', "id={$todo->objectID}", ' BUG#' . $todo->objectID);
+ if($todo->type == 'task') common::printLink('task', 'view', "id={$todo->objectID}", ' TASK#' . $todo->objectID);
+ if($todo->type == 'story') common::printLink('story', 'view', "id={$todo->objectID}", ' STORY#' . $todo->objectID);
?>
desc;?>
diff --git a/module/todo/zen.php b/module/todo/zen.php
index b7a366542a..73687f6547 100755
--- a/module/todo/zen.php
+++ b/module/todo/zen.php
@@ -3,6 +3,60 @@ declare(strict_types=1);
class todoZen extends todo
{
+ /**
+ * 处理请求数据
+ * Processing request data.
+ *
+ * @param object $formData
+ * @return object|false
+ */
+ protected function beforeCreate(object $formData): object|bool
+ {
+ $formData = $formData->remove(implode(',', $this->config->todo->moduleList) . ',uid')->stripTags($this->config->todo->editor->create['id'], $this->config->allowedTags)->get();
+
+ $objectID = 0;
+ $hasObject = in_array($formData->type, $this->config->todo->moduleList);
+ if($hasObject && $formData->type) $objectID = $formData->uid ? $formData->type : $formData->objectID;
+
+ $formData->account = $this->app->user->account;
+ $formData->assignedTo = zget($formData, 'assignedTo', $this->app->user->account);
+ $formData->assignedBy = zget($formData, 'assignedBy', $this->app->user->account);
+ if($hasObject && $formData->type) $formData->objectID = $objectID;
+ if($formData->status == 'done') $formData->finishedBy = $this->app->user->account;
+ if($formData->status == 'done') $formData->finishedDate = helper::now();
+
+ if(!isset($formData->pri) and in_array($formData->type, $this->config->todo->moduleList) and $formData->type !== 'review' and $formData->type !== 'feedback')
+ {
+ // TODO
+ $formData->pri = $this->dao->select('pri')->from($this->config->objectTables[$formData->type])->where('id')->eq($formData->objectID)->fetch('pri');
+
+ if($formData->pri == 'high') $formData->pri = 1;
+ if($formData->pri == 'middle') $formData->pri = 2;
+ if($formData->pri == 'low') $formData->pri = 3;
+ }
+
+ if($formData->type != 'custom' and $formData->objectID)
+ {
+ $type = $formData->type;
+ $object = $this->loadModel($type)->getByID($formData->$type);
+ if(isset($object->name)) $formData->name = $object->name;
+ if(isset($object->title)) $formData->name = $object->title;
+ }
+
+ if($formData->end < $formData->begin)
+ {
+ dao::$errors[] = sprintf($this->lang->error->gt, $this->lang->todo->end, $this->lang->todo->begin);
+ return false;
+ }
+
+ if(!empty($formData->cycle)) $formData = $this->setCycle($formData);
+ else unset($formData->config);
+
+ $formData = $this->loadModel('file')->processImgURL($formData, $this->config->todo->editor->create['id'], $this->post->uid);
+
+ return $formData;
+ }
+
/**
* 创建待办
* Create a todo.
@@ -47,20 +101,20 @@ class todoZen extends todo
* @param object $formData
* @return object|false
*/
- protected function beforeEdit(int $todoID, object $formData)
+ protected function beforeEdit(int $todoID, object $formData): object|false
{
$oldTodo = $this->dao->findById($todoID)->from(TABLE_TODO)->fetch();
- $idvalue = 0;
+ $objectID = 0;
$rowData = $formData->rawdata;
$objectType = $rowData->type;
$hasObject = in_array($objectType, $this->config->todo->moduleList);
- if($hasObject && $objectType) $idvalue = $rowData->uid ? $rowData->$objectType : $rowData->idvalue;
+ if($hasObject && $objectType) $objectID = $rowData->uid ? $rowData->$objectType : $rowData->objectID;
$todo = $formData->add('account', $oldTodo->account)
->cleanInt('pri, begin, end, private')
->setIF(in_array($rowData->type, array('bug', 'task', 'story')), 'name', '')
- ->setIF($hasObject && $objectType, 'idvalue', $idvalue)
+ ->setIF($hasObject && $objectType, 'objectID', $objectID)
->setIF($rowData->date == false, 'date', '2030-01-01')
->setIF($rowData->begin == false, 'begin', '2400')
->setIF($rowData->end == false, 'end', '2400')
@@ -70,7 +124,7 @@ class todoZen extends todo
->remove(implode(',', $this->config->todo->moduleList) . ',uid')
->get();
- $todo = (object) array_merge((array) $todo, (array) $rowData);
+ $todo = (object) array_merge((array) $rowData, (array) $todo);
if(in_array($todo->type, $this->config->todo->moduleList))
{
@@ -196,12 +250,12 @@ class todoZen extends todo
protected function printConfirm(object $todo): int
{
$confirmNote = 'confirm' . ucfirst($todo->type);
- $confirmURL = $this->createLink($todo->type, 'view', "id=$todo->idvalue");
+ $confirmURL = $this->createLink($todo->type, 'view', "id=$todo->objectID");
$okTarget = isonlybody() ? 'parent' : 'window.parent.$.apps.open';
if($todo->type == 'bug') $app = 'qa';
if($todo->type == 'task') $app = 'execution';
if($todo->type == 'story') $app = 'product';
$cancelURL = $this->server->HTTP_REFERER;
- return print(js::confirm(sprintf($this->lang->todo->$confirmNote, $todo->idvalue), $confirmURL, $cancelURL, $okTarget, 'parent', $app));
+ return print(js::confirm(sprintf($this->lang->todo->$confirmNote, $todo->objectID), $confirmURL, $cancelURL, $okTarget, 'parent', $app));
}
}