From 71cf4104860dca70409f92671469c7f43c3c6615 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Wed, 23 Dec 2020 15:39:46 +0800 Subject: [PATCH] * Finish task#8733. --- module/program/lang/de.php | 6 +- module/program/lang/en.php | 6 +- module/program/lang/fr.php | 6 +- module/program/lang/vi.php | 6 +- module/program/lang/zh-cn.php | 10 +-- module/program/lang/zh-tw.php | 10 +-- module/program/model.php | 8 ++- module/program/view/prjcreate.html.php | 96 +++++++++++++------------- 8 files changed, 75 insertions(+), 73 deletions(-) diff --git a/module/program/lang/de.php b/module/program/lang/de.php index 92c6a6da98..65000e8eee 100644 --- a/module/program/lang/de.php +++ b/module/program/lang/de.php @@ -112,14 +112,14 @@ $lang->program->featureBar['wait'] = 'Waiting'; $lang->program->featureBar['suspended'] = 'Suspended'; $lang->program->featureBar['closed'] = 'Closed'; -$lang->program->PRJAclList['open'] = "Open(Users who can visit project can access it)"; +$lang->program->PRJAclList['open'] = "Open(accessible with project view permissions)"; $lang->program->PRJAclList['private'] = 'Private (For team members and stakeholders only)'; $lang->program->PGMPRJAclList['open'] = "Full disclosure (accessible with project view permissions)"; $lang->program->PGMPRJAclList['program'] = "Public within the project set (accessible to all higher-level project set leaders and stakeholders, members of this project team and stakeholders)"; -$lang->program->PGMPRJAclList['private'] = "Private (accessible to project team members and associates)"; +$lang->program->PGMPRJAclList['private'] = "Private (For team members and stakeholders only)"; -$lang->program->PRJAuthList['extend'] = 'Inherit (project privilege and company privilege)'; +$lang->program->PRJAuthList['extend'] = 'Inherit (system privilege and project privilege)'; $lang->program->PRJAuthList['reset'] = 'Reset (project privilege only)'; $lang->program->statusList['wait'] = 'Waiting'; diff --git a/module/program/lang/en.php b/module/program/lang/en.php index 8667293a72..9784092c5f 100644 --- a/module/program/lang/en.php +++ b/module/program/lang/en.php @@ -112,14 +112,14 @@ $lang->program->featureBar['wait'] = 'Waiting'; $lang->program->featureBar['suspended'] = 'Suspended'; $lang->program->featureBar['closed'] = 'Closed'; -$lang->program->PRJAclList['open'] = "Open(Users who can visit project can access it)"; +$lang->program->PRJAclList['open'] = "Open(accessible with project view permissions)"; $lang->program->PRJAclList['private'] = 'Private (For team members and stakeholders only)'; $lang->program->PGMPRJAclList['open'] = "Full disclosure (accessible with project view permissions)"; $lang->program->PGMPRJAclList['program'] = "Public within the project set (accessible to all higher-level project set leaders and stakeholders, members of this project team and stakeholders)"; -$lang->program->PGMPRJAclList['private'] = "Private (accessible to project team members and associates)"; +$lang->program->PGMPRJAclList['private'] = "Private (For team members and stakeholders only)"; -$lang->program->PRJAuthList['extend'] = 'Inherit (project privilege and company privilege)'; +$lang->program->PRJAuthList['extend'] = 'Inherit (system privilege and project privilege)'; $lang->program->PRJAuthList['reset'] = 'Reset (project privilege only)'; $lang->program->statusList['wait'] = 'Waiting'; diff --git a/module/program/lang/fr.php b/module/program/lang/fr.php index 92c6a6da98..65000e8eee 100644 --- a/module/program/lang/fr.php +++ b/module/program/lang/fr.php @@ -112,14 +112,14 @@ $lang->program->featureBar['wait'] = 'Waiting'; $lang->program->featureBar['suspended'] = 'Suspended'; $lang->program->featureBar['closed'] = 'Closed'; -$lang->program->PRJAclList['open'] = "Open(Users who can visit project can access it)"; +$lang->program->PRJAclList['open'] = "Open(accessible with project view permissions)"; $lang->program->PRJAclList['private'] = 'Private (For team members and stakeholders only)'; $lang->program->PGMPRJAclList['open'] = "Full disclosure (accessible with project view permissions)"; $lang->program->PGMPRJAclList['program'] = "Public within the project set (accessible to all higher-level project set leaders and stakeholders, members of this project team and stakeholders)"; -$lang->program->PGMPRJAclList['private'] = "Private (accessible to project team members and associates)"; +$lang->program->PGMPRJAclList['private'] = "Private (For team members and stakeholders only)"; -$lang->program->PRJAuthList['extend'] = 'Inherit (project privilege and company privilege)'; +$lang->program->PRJAuthList['extend'] = 'Inherit (system privilege and project privilege)'; $lang->program->PRJAuthList['reset'] = 'Reset (project privilege only)'; $lang->program->statusList['wait'] = 'Waiting'; diff --git a/module/program/lang/vi.php b/module/program/lang/vi.php index 92c6a6da98..65000e8eee 100644 --- a/module/program/lang/vi.php +++ b/module/program/lang/vi.php @@ -112,14 +112,14 @@ $lang->program->featureBar['wait'] = 'Waiting'; $lang->program->featureBar['suspended'] = 'Suspended'; $lang->program->featureBar['closed'] = 'Closed'; -$lang->program->PRJAclList['open'] = "Open(Users who can visit project can access it)"; +$lang->program->PRJAclList['open'] = "Open(accessible with project view permissions)"; $lang->program->PRJAclList['private'] = 'Private (For team members and stakeholders only)'; $lang->program->PGMPRJAclList['open'] = "Full disclosure (accessible with project view permissions)"; $lang->program->PGMPRJAclList['program'] = "Public within the project set (accessible to all higher-level project set leaders and stakeholders, members of this project team and stakeholders)"; -$lang->program->PGMPRJAclList['private'] = "Private (accessible to project team members and associates)"; +$lang->program->PGMPRJAclList['private'] = "Private (For team members and stakeholders only)"; -$lang->program->PRJAuthList['extend'] = 'Inherit (project privilege and company privilege)'; +$lang->program->PRJAuthList['extend'] = 'Inherit (system privilege and project privilege)'; $lang->program->PRJAuthList['reset'] = 'Reset (project privilege only)'; $lang->program->statusList['wait'] = 'Waiting'; diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php index 6a67317cb7..7ac3081275 100644 --- a/module/program/lang/zh-cn.php +++ b/module/program/lang/zh-cn.php @@ -112,14 +112,14 @@ $lang->program->featureBar['wait'] = '未开始'; $lang->program->featureBar['suspended'] = '已挂起'; $lang->program->featureBar['closed'] = '已关闭'; -$lang->program->PRJAclList['open'] = "公开(有项目视图权限，即可访问)"; -$lang->program->PRJAclList['private'] = "私有(项目团队成员和干系人可访问)"; +$lang->program->PRJAclList['open'] = "公开(有项目视图权限即可访问)"; +$lang->program->PRJAclList['private'] = "私有(只有项目团队成员和干系人可访问)"; -$lang->program->PGMPRJAclList['open'] = "全部公开（有项目视图权限，即可访问）"; +$lang->program->PGMPRJAclList['open'] = "全部公开（有项目视图权限即可访问）"; $lang->program->PGMPRJAclList['program'] = "项目集内公开（所有上级项目集负责人和干系人，本项目团队成员和干系人可访问）"; -$lang->program->PGMPRJAclList['private'] = "私有(项目团队成员和干系人可访问)"; +$lang->program->PGMPRJAclList['private'] = "私有(只有项目团队成员和干系人可访问)"; -$lang->program->PRJAuthList['extend'] = '继承(取项目权限与组织权限的并集)'; +$lang->program->PRJAuthList['extend'] = '继承(取系统权限与项目权限的合集)'; $lang->program->PRJAuthList['reset'] = '重新定义(只取项目权限)'; $lang->program->statusList['wait'] = '未开始'; diff --git a/module/program/lang/zh-tw.php b/module/program/lang/zh-tw.php index 57bcab6d58..95bba62aae 100644 --- a/module/program/lang/zh-tw.php +++ b/module/program/lang/zh-tw.php @@ -114,14 +114,14 @@ $lang->program->featureBar['wait'] = '未開始'; $lang->program->featureBar['suspended'] = '已掛起'; $lang->program->featureBar['closed'] = '已關閉'; -$lang->program->PRJAclList['open'] = "公開(有項目視圖權限，即可訪問)"; -$lang->program->PRJAclList['private'] = "私有(項目團隊成員和干係人可訪問)"; +$lang->program->PRJAclList['open'] = "公開(有項目視圖權限即可訪問)"; +$lang->program->PRJAclList['private'] = "私有(只有項目團隊成員和干係人可訪問)"; -$lang->program->PGMPRJAclList['open'] = "全部公開（有項目視圖權限，即可訪問）"; +$lang->program->PGMPRJAclList['open'] = "全部公開（有項目視圖權限即可訪問）"; $lang->program->PGMPRJAclList['program'] = "項目集內公開（所有上級項目集負責人和干係人，本項目團隊成員和干係人可訪問）"; -$lang->program->PGMPRJAclList['private'] = "私有(項目團隊成員和干係人可訪問)"; +$lang->program->PGMPRJAclList['private'] = "私有(只有項目團隊成員和干係人可訪問)"; -$lang->program->PRJAuthList['extend'] = '繼承(取項目權限與組織權限的並集)'; +$lang->program->PRJAuthList['extend'] = '繼承(取系統權限與項目權限的合集)'; $lang->program->PRJAuthList['reset'] = '重新定義(只取項目權限)'; $lang->program->statusList['wait'] = '未開始'; diff --git a/module/program/model.php b/module/program/model.php index e414dfed81..cce539b43c 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -1206,19 +1206,21 @@ class programModel extends model */ public function PRJCreate() { + a($_POST);die; $project = fixer::input('post') ->setDefault('status', 'wait') ->setIF($this->post->delta == 999, 'end', LONG_TIME) ->setIF($this->post->delta == 999, 'days', 0) - ->setIF($this->post->acl == 'open', 'whitelist', '') + ->setIF($this->post->acl == 'open', 'whitelist', '') + ->setIF($this->post->budget != 0, 'budget', number_format($this->post->budget, 2)) ->setDefault('openedBy', $this->app->user->account) ->setDefault('openedDate', helper::now()) ->setDefault('team', substr($this->post->name, 0, 30)) ->add('type', 'project') ->join('whitelist', ',') - ->cleanInt('budget') + ->cleanFloat('budget') ->stripTags($this->config->program->editor->prjcreate['id'], $this->config->allowedTags) - ->remove('products,branch,plans,delta,newProduct,productName') + ->remove('products,branch,plans,delta,newProduct,productName,future') ->get(); $linkedProductsCount = 0; diff --git a/module/program/view/prjcreate.html.php b/module/program/view/prjcreate.html.php index 7c5b4a4f5a..0a04e094c1 100644 --- a/module/program/view/prjcreate.html.php +++ b/module/program/view/prjcreate.html.php @@ -44,9 +44,47 @@ - program->PRJCode;?> - + program->PRJPM;?> + + + program->PRJBudget;?> + +
+ + + program->unitList, empty($parentProgram->budgetUnit) ? 'wanyuan' : $parentProgram->budgetUnit, "class='form-control'");?> +
+ + +
+ + +
+ + + + program->dateRange;?> + +
+ program->begin . "' required");?> + program->to;?> + program->end . "' required");?> +
+ + program->endList , '', "onclick='computeEndDate(this.value)'");?> + + + + project->days;?> + +
+ + project->day;?> +
+ + + project->manageProducts;?> @@ -72,6 +110,10 @@ + + product->name;?> + + project->linkPlan;?> @@ -89,47 +131,6 @@ - - product->name;?> - - - - program->PRJPM;?> - - - - program->PRJBudget;?> - -
- - - program->unitList, empty($parentProgram->budgetUnit) ? 'wanyuan' : $parentProgram->budgetUnit, "class='form-control'");?> -
- - - - - program->dateRange;?> - -
- program->begin . "' required");?> - program->to;?> - program->end . "' required");?> -
- - program->endList , '', "onclick='computeEndDate(this.value)'");?> - - - - project->days;?> - -
- - project->day;?> -
- - - printExtendFields('', 'table');?> program->PRJStoryConcept;?> @@ -140,14 +141,9 @@ program->PRJDesc;?> - fetch('user', 'ajaxPrintTemplates', 'type=project&link=desc');?> - - program->auth;?> - program->PRJAuthList, $auth, '', 'block');?> - project->acl;?> program->PRJAclList, $acl, "onclick='setWhite(this.value);'", 'block'));?> @@ -158,6 +154,10 @@ + + program->auth;?> + program->PRJAuthList, $auth, '', 'block');?> +