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

* [task#142079,done,1h] code for task.

Browse Source
This commit is contained in:
sunguangming
2025-05-19 09:26:26 +08:00
committed by 刘刚
parent 9b2567c990
commit dc77137846
9 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update21.6.1.sql
+1
View File
@@ -4,3 +4,4 @@ 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`;
ALTER TABLE `zt_project` ADD `taskDateLimit` varchar(30) NOT NULL DEFAULT 'auto' AFTER `linkType`;
db/zentao.sql
+1
View File
@@ -1592,6 +1592,7 @@ CREATE TABLE IF NOT EXISTS `zt_project` (
`parallel` mediumint(9) NOT NULL DEFAULT '0',
`enabled` enum('on','off') NOT NULL DEFAULT 'on',
`linkType` varchar(30) NOT NULL DEFAULT 'plan',
`taskDateLimit` varchar(30) NOT NULL DEFAULT 'auto',
`colWidth` smallint(6) NOT NULL DEFAULT '264',
`minColWidth` smallint(6) NOT NULL DEFAULT '200',
`maxColWidth` smallint(6) NOT NULL DEFAULT '384',
module/project/config/form.php
+4 -3
View File
@@ -32,9 +32,10 @@ $config->project->form->create['vision'] = array('type' => 'string', 'requir
if(isset($this->config->setCode) && $this->config->setCode == 1) $config->project->form->create['code'] = array('type' => 'string', 'required' => false, 'filter' => 'trim');
$config->project->form->edit = $config->project->form->create;
$config->project->form->edit['products'] = array('type' => 'array', 'required' => false, 'default' => array());
$config->project->form->edit['branch'] = array('type' => 'array', 'required' => false, 'default' => array());
$config->project->form->edit['plans'] = array('type' => 'array', 'required' => false, 'default' => array());
$config->project->form->edit['products'] = array('type' => 'array', 'required' => false, 'default' => array());
$config->project->form->edit['branch'] = array('type' => 'array', 'required' => false, 'default' => array());
$config->project->form->edit['plans'] = array('type' => 'array', 'required' => false, 'default' => array());
$config->project->form->edit['taskDateLimit'] = array('type' => 'string', 'required' => false, 'default' => array());
unset($config->project->form->edit['hasProduct']);
unset($config->project->form->edit['stageBy']);
unset($config->project->form->edit['multiple']);
module/project/lang/de.php
+4
View File
@@ -218,6 +218,7 @@ $lang->project->plan = 'Plan';
$lang->project->createKanban = 'Create Kanban';
$lang->project->kanban = 'Kanban';
$lang->project->moreActions = 'More Actions';
$lang->project->taskDateLimit = 'Task Date Limit';
/* Project Category. */
$lang->project->projectTypeList = array();
@@ -362,6 +363,9 @@ $lang->project->featureBar['group']['all'] = 'All Groups';
$lang->project->aclList['open'] = "Open (accessible with {$lang->projectCommon} view permissions)";
$lang->project->aclList['private'] = "Private (For the {$lang->projectCommon} leader, team members and stakeholders only)";
$lang->project->taskDateLimitList['limit'] = "Limit the task date (the task start and end date must be within the parent task's date range)";
$lang->project->taskDateLimitList['auto'] = "Auto extend the parent task date (the parent task will be automatically extended according to the task start and end date)";
$lang->project->multipleList['1'] = 'Yes';
$lang->project->multipleList['0'] = 'No';
module/project/lang/en.php
+4
View File
@@ -218,6 +218,7 @@ $lang->project->plan = 'Plan';
$lang->project->createKanban = 'Create Kanban';
$lang->project->kanban = 'Kanban';
$lang->project->moreActions = 'More Actions';
$lang->project->taskDateLimit = 'Task Date Limit';
/* Project Category. */
$lang->project->projectTypeList = array();
@@ -362,6 +363,9 @@ $lang->project->featureBar['group']['all'] = 'All Groups';
$lang->project->aclList['open'] = "Open (accessible with {$lang->projectCommon} view permissions)";
$lang->project->aclList['private'] = "Private (For the {$lang->projectCommon} leader, team members and stakeholders only)";
$lang->project->taskDateLimitList['limit'] = "Limit the task date (the task start and end date must be within the parent task's date range)";
$lang->project->taskDateLimitList['auto'] = "Auto extend the parent task date (the parent task will be automatically extended according to the task start and end date)";
$lang->project->multipleList['1'] = 'Yes';
$lang->project->multipleList['0'] = 'No';
module/project/lang/fr.php
+4
View File
@@ -218,6 +218,7 @@ $lang->project->plan = 'Plan';
$lang->project->createKanban = 'Create Kanban';
$lang->project->kanban = 'Kanban';
$lang->project->moreActions = 'More Actions';
$lang->project->taskDateLimit = 'Task Date Limit';
/* Project Category. */
$lang->project->projectTypeList = array();
@@ -362,6 +363,9 @@ $lang->project->featureBar['group']['all'] = 'All Groups';
$lang->project->aclList['open'] = "Open (accessible with {$lang->projectCommon} view permissions)";
$lang->project->aclList['private'] = "Private (For the {$lang->projectCommon} leader, team members and stakeholders only)";
$lang->project->taskDateLimitList['limit'] = "Limit the task date (the task start and end date must be within the parent task's date range)";
$lang->project->taskDateLimitList['auto'] = "Auto extend the parent task date (the parent task will be automatically extended according to the task start and end date)";
$lang->project->multipleList['1'] = 'Yes';
$lang->project->multipleList['0'] = 'No';
module/project/lang/zh-cn.php
+4
View File
@@ -218,6 +218,7 @@ $lang->project->plan = '所属计划';
$lang->project->createKanban = '添加看板';
$lang->project->kanban = '项目看板';
$lang->project->moreActions = '更多操作';
$lang->project->taskDateLimit = '任务时间限制';
/* Project Category. */
$lang->project->projectTypeList = array();
@@ -362,6 +363,9 @@ $lang->project->featureBar['group']['all'] = '浏览分组';
$lang->project->aclList['open'] = "公开 (有{$lang->projectCommon}视图权限即可访问)";
$lang->project->aclList['private'] = "私有 (只有{$lang->projectCommon}负责人、团队成员和干系人可访问)";
$lang->project->taskDateLimitList['limit'] = "限制子任务时间（子任务起止时间必须在父任务的范围内）";
$lang->project->taskDateLimitList['auto'] = "自动延长父任务时间（父任务根据子任务的起止时间自动延长）";
$lang->project->multipleList['1'] = '是';
$lang->project->multipleList['0'] = '否';
module/project/ui/common.field.php
+2 -1
View File
@@ -140,4 +140,5 @@ foreach($lang->story->typeList as $key => $text)
$storyTypeList[] = array('text' => $text, 'value' => $key, 'disabled' => $disabled);
}
$fields->field('storyType')->control(array('control' => 'checkBox', 'items' => $storyTypeList, 'name' => 'storyType[]'));
$fields->field('taskDateLimit')->control(array('control' => 'radioList', 'items' => $lang->project->taskDateLimitList, 'name' => 'taskDateLimit'));
$fields->field('storyType')->control(array('control' => 'checkBox', 'items' => $storyTypeList, 'name' => 'storyType[]'));
module/project/ui/edit.field.php
+2 -1
View File
@@ -21,4 +21,5 @@ if(strpos($config->project->edit->requiredFields, 'budget') === false) $fields->
$fields->field('budget')->value(data('project.budget') !== null && data('project.budget') == 0 ? '' : data('project.budget'));
$fields->field('acl')->control(array('control' => 'aclBox', 'aclItems' => data('project.parent') ? $lang->project->subAclList : $lang->project->aclList, 'aclValue' => data('project.acl'), 'whitelistLabel' => $lang->project->whitelist, 'userValue' => data('project.whitelist')));
$fields->field('storyType')->width('full')->value(data('project.storyType'));
$fields->field('taskDateLimit')->width('full')->value(data('project.taskDateLimit'));
$fields->field('storyType')->width('full')->value(data('project.storyType'));