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

Merge remote-tracking branch 'origin/release-20.0'

Browse Source
This commit is contained in:
tianshujie
2024-04-23 17:12:24 +08:00
parent 63d51564de 8856db689c
commit bced2b76b4
191 changed files with 1353 additions and 866 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/config/form.php
+14 -12
View File
@@ -6,6 +6,8 @@ $config->task->form->team = new stdclass();
$config->task->form->testTask = new stdclass();
global $app;
$account = isset($app->user->account) ? $app->user->account : '';
$config->task->form->create = array();
$config->task->form->create['execution'] = array('type' => 'int', 'required' => true, 'default' => 0);
$config->task->form->create['type'] = array('type' => 'string', 'required' => true, 'default' => '');
@@ -22,7 +24,7 @@ $config->task->form->create['estStarted'] = array('type' => 'date', 'requi
$config->task->form->create['deadline'] = array('type' => 'date', 'required' => false, 'default' => null);
$config->task->form->create['vision'] = array('type' => 'string', 'required' => false, 'default' => $config->vision);
$config->task->form->create['status'] = array('type' => 'string', 'required' => false, 'default' => 'wait');
$config->task->form->create['openedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->task->form->create['openedBy'] = array('type' => 'string', 'required' => false, 'default' => $account);
$config->task->form->create['openedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->task->form->create['version'] = array('type' => 'int', 'required' => false, 'default' => 1);
$config->task->form->create['storyVersion'] = array('type' => 'int', 'required' => false, 'default' => 1);
@@ -34,7 +36,7 @@ $config->task->form->assign = array();
$config->task->form->assign['assignedTo'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->task->form->assign['assignedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->task->form->assign['left'] = array('type' => 'float', 'required' => true);
$config->task->form->assign['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->task->form->assign['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $account);
$config->task->form->assign['lastEditedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->task->form->cancel = array();
@@ -76,7 +78,7 @@ $config->task->form->edit['canceledDate'] = array('type' => 'datetime', 'requi
$config->task->form->edit['closedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$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['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $account);
$config->task->form->edit['lastEditedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->task->form->edit['deleteFiles'] = array('type' => 'array', 'required' => false, 'default' => array());
@@ -103,7 +105,7 @@ $config->task->form->batchedit['consumed'] = array('type' => 'float', '
$config->task->form->batchedit['left'] = array('type' => 'float', 'required' => false, 'default' => 0);
$config->task->form->batchedit['estStarted'] = array('type' => 'date', 'required' => false, 'default' => null);
$config->task->form->batchedit['deadline'] = array('type' => 'date', 'required' => false, 'default' => null);
$config->task->form->batchedit['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->task->form->batchedit['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $account);
$config->task->form->batchedit['lastEditedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->task->form->batchcreate = array();
@@ -122,12 +124,12 @@ $config->task->form->batchcreate['deadline'] = array('type' => 'date',
$config->task->form->batchcreate['desc'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->task->form->batchcreate['pri'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->task->form->batchcreate['lane'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->task->form->batchcreate['openedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->task->form->batchcreate['openedBy'] = array('type' => 'string', 'required' => false, 'default' => $account);
$config->task->form->batchcreate['openedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->task->form->batchcreate['vision'] = array('type' => 'string', 'required' => false, 'default' => $config->vision);
$config->task->form->pause = array();
$config->task->form->pause['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->task->form->pause['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $account);
$config->task->form->pause['lastEditedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->task->form->pause['status'] = array('type' => 'string', 'required' => false, 'default' => 'pause');
@@ -139,7 +141,7 @@ $config->task->form->activate['comment'] = array('type' => 'string', 'r
$config->task->form->activate['status'] = array('type' => 'string', 'required' => false, 'default' => 'doing');
$config->task->form->activate['activatedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->task->form->activate['assignedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->task->form->activate['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->task->form->activate['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $account);
$config->task->form->activate['lastEditedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->task->form->activate['finishedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->task->form->activate['canceledBy'] = array('type' => 'string', 'required' => false, 'default' => '');
@@ -155,7 +157,7 @@ $config->task->form->start['consumed'] = array('type' => 'float', 'requ
$config->task->form->start['left'] = array('type' => 'float', 'required' => false, 'default' => 0);
$config->task->form->start['assignedTo'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->task->form->start['realStarted'] = array('type' => 'datetime', 'required' => false, 'default' => null);
$config->task->form->start['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->task->form->start['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $account);
$config->task->form->start['lastEditedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->task->form->finish = array();
@@ -167,17 +169,17 @@ $config->task->form->finish['status'] = array('type' => 'string', 're
$config->task->form->finish['finishedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->task->form->finish['lastEditedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->task->form->finish['assignedDate'] = array('type' => 'string', 'required' => false, 'default' => $now);
$config->task->form->finish['finishedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->task->form->finish['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->task->form->finish['finishedBy'] = array('type' => 'string', 'required' => false, 'default' => $account);
$config->task->form->finish['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $account);
$config->task->form->finish['lastEditedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->task->form->close = array();
$config->task->form->close['status'] = array('type' => 'string', 'required' => false, 'default' => 'closed');
$config->task->form->close['assignedTo'] = array('type' => 'string', 'required' => false, 'default' => 'closed');
$config->task->form->close['assignedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->task->form->close['closedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->task->form->close['closedBy'] = array('type' => 'string', 'required' => false, 'default' => $account);
$config->task->form->close['closedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->task->form->close['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
$config->task->form->close['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $account);
$config->task->form->close['lastEditedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->task->form->testTask->create = array();
module/task/control.php
+1 -1
View File
@@ -333,7 +333,7 @@ class task extends control
if(!$task)
{
if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'code' => 404, 'message' => '404 Not found'));
return $this->send(array('result' => 'success', 'load' => array('alert' => $this->lang->notFound, 'locate' => $this->config->vision == 'lite' ? $this->createLink('project', 'index') : $this->createLink('execution', 'all'))));
return $this->sendError($this->lang->notFound, $this->config->vision == 'lite' ? $this->createLink('project', 'index') : $this->createLink('execution', 'all'));
}
if(!$this->loadModel('common')->checkPrivByObject('execution', $task->execution)) return print(js::error($this->lang->execution->accessDenied) . js::locate($this->createLink('execution', 'all')));