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

* [bug#62377,done,0.5h,0h] Finish task and design related docs support version management.

Browse Source
This commit is contained in:
wangyuting
2025-05-09 18:01:11 +08:00
committed by 刘刚
parent 9599f0da37
commit 751b88ecb0
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update21.6.1.sql
+2
View File
@@ -1,4 +1,6 @@
ALTER TABLE `zt_task` ADD COLUMN `docs` text NULL AFTER `fromIssue`;
ALTER TABLE `zt_task` ADD COLUMN `docVersions` text NULL AFTER `docs`;
ALTER TABLE `zt_storyspec` ADD COLUMN `docs` text NULL AFTER `files`;
ALTER TABLE `zt_storyspec` ADD COLUMN `docVersions` text NULL AFTER `docs`;
ALTER TABLE `zt_design` ADD COLUMN `docs` text NULL AFTER `storyVersion`;
ALTER TABLE `zt_design` ADD COLUMN `docVersions` text NULL AFTER `docs`;
module/design/model.php
+2 -2
View File
@@ -23,7 +23,7 @@ class designModel extends model
public function create(object $design): bool|int
{
$design = $this->loadModel('file')->processImgURL($design, 'desc', (string)$this->post->uid);
$this->dao->insert(TABLE_DESIGN)->data($design)
$this->dao->insert(TABLE_DESIGN)->data($design, 'docVersions')
->autoCheck()
->batchCheck($this->config->design->create->requiredFields, 'notempty')
->exec();
@@ -97,7 +97,7 @@ class designModel extends model
if(!$oldDesign) return false;
$design = $this->loadModel('file')->processImgURL($design, 'desc', (string)$this->post->uid);
$this->dao->update(TABLE_DESIGN)->data($design, 'deleteFiles,renameFiles,files')->autoCheck()->batchCheck($this->config->design->edit->requiredFields, 'notempty')->where('id')->eq($designID)->exec();
$this->dao->update(TABLE_DESIGN)->data($design, 'deleteFiles,renameFiles,files,docs,oldDocs,docVersions')->autoCheck()->batchCheck($this->config->design->edit->requiredFields, 'notempty')->where('id')->eq($designID)->exec();
if(dao::isError()) return false;
module/task/model.php
+1 -1
View File
@@ -973,7 +973,7 @@ class taskModel extends model
/* Insert task data. */
if(empty($task->assignedTo)) unset($task->assignedDate);
$this->dao->insert(TABLE_TASK)->data($task)
$this->dao->insert(TABLE_TASK)->data($task, 'docVersions')
->checkIF($task->estimate != '', 'estimate', 'float')
->autoCheck()
->batchCheck($requiredFields, 'notempty')
module/task/tao.php
+1 -1
View File
@@ -448,7 +448,7 @@ class taskTao extends taskModel
$task->lastEditedDate = helper::now();
}
$this->dao->update(TABLE_TASK)->data($task, 'deleteFiles,renameFiles,files')
$this->dao->update(TABLE_TASK)->data($task, 'deleteFiles,renameFiles,files,docVersions,oldDocs,docs')
->autoCheck()
->batchCheckIF($task->status != 'cancel', $requiredFields, 'notempty')
->checkIF(!helper::isZeroDate($task->deadline), 'deadline', 'ge', $task->estStarted)