From b48f02e66ad2f27edae77af01fbbc8c231166fcf Mon Sep 17 00:00:00 2001 From: Hao Sun Date: Thu, 2 Sep 2021 10:55:14 +0800 Subject: [PATCH] * task #41783, fix tutorial task for classic mode. --- module/execution/view/all.html.php | 2 +- module/tutorial/control.php | 1 + module/tutorial/lang/en.php | 11 ++++++++++- module/tutorial/lang/zh-cn.php | 10 +++++++++- module/tutorial/view/index.html.php | 1 + 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index 51004233d6..fb03774f19 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -75,7 +75,7 @@ id);?> - flex' title='name?>'> + flex' title='name?>'> config->maxVersion)):?> '>execution->typeList[$execution->type]?> diff --git a/module/tutorial/control.php b/module/tutorial/control.php index d80b9f03ef..1d938ee6ba 100644 --- a/module/tutorial/control.php +++ b/module/tutorial/control.php @@ -38,6 +38,7 @@ class tutorial extends control $this->view->current = $task; $this->view->setting = $setting; $this->view->referer = base64_decode($referer); + $this->view->mode = $this->setting->getItem('owner=system&module=common§ion=global&key=mode'); $this->display(); } diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php index 5cff47f1ac..8931d401ff 100644 --- a/module/tutorial/lang/en.php +++ b/module/tutorial/lang/en.php @@ -41,6 +41,7 @@ $lang->tutorial->tasks['createAccount']['nav'] = array('app' => 'admin', 'modul $lang->tutorial->tasks['createAccount']['desc'] = "

Create a User:

"; $lang->tutorial->tasks['createProgram'] = array('title' => 'Create a program'); +$lang->tutorial->tasks['createProgram']['mode'] = 'new'; $lang->tutorial->tasks['createProgram']['nav'] = array('app' => 'program', 'module' => 'program', 'method' => 'create', 'menuModule' => 'program', 'menu' => 'browse', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-program-btn', 'targetPageName' => 'Create program'); $lang->tutorial->tasks['createProgram']['desc'] = "

Create a new program：

"; @@ -62,17 +63,25 @@ if($config->global->flow == 'full' or $config->global->flow == 'onlyStory') if($config->global->flow == 'full' or $config->global->flow == 'onlyTask') { $lang->tutorial->tasks['createProject'] = array('title' => 'Create a ' . $lang->executionCommon); + $lang->tutorial->tasks['createProject']['mode'] = 'new'; $lang->tutorial->tasks['createProject']['nav'] = array('app' => 'project', 'module' => 'project', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Create ' . $lang->projectCommon); $lang->tutorial->tasks['createProject']['desc'] = "

Create a {$lang->projectCommon}:

"; $lang->tutorial->tasks['manageTeam'] = array('title' => "Manage {$lang->projectCommon} Team"); - $lang->tutorial->tasks['manageTeam']['nav'] = array('app' => 'project', 'module' => 'project', 'method' => 'managemembers', 'menuModule' => 'settings', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectTableList>tr:first>.c-name>a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="members"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Manage team members'); + $lang->tutorial->tasks['manageTeam']['mode'] = 'new'; + $lang->tutorial->tasks['manageTeam']['nav'] = array('app' => 'project', 'module' => 'project', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectTableList>tr:first>.c-name>a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="members"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Manage team members'); $lang->tutorial->tasks['manageTeam']['desc'] = "

Manage {$lang->projectCommon} team members:

"; $lang->tutorial->tasks['createExecution'] = array('title' => 'Create a ' . $lang->executionCommon); $lang->tutorial->tasks['createExecution']['nav'] = array('app' => 'execution', 'module' => 'execution', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],.create-execution-btn', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-execution-btn', 'targetPageName' => 'Create ' . $lang->executionCommon); $lang->tutorial->tasks['createExecution']['desc'] = "

Create a new {$lang->executionCommon}：

"; + $lang->tutorial->tasks['manageExecutionTeam'] = array('title' => "Manage {$lang->executionCommon} Team"); + $lang->tutorial->tasks['manageExecutionTeam']['mode'] = 'classic'; + $lang->tutorial->tasks['manageExecutionTeam']['nav'] = array('app' => 'execution', 'module' => 'execution', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#executionTableList>tr:first>.c-name>a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="team"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Manage team members'); + $lang->tutorial->tasks['manageExecutionTeam']['desc'] = "

Manage {$lang->projectCommon} team members:

"; + + if($config->global->flow == 'full') { $lang->tutorial->tasks['linkStory'] = array('title' => 'Link a Story'); diff --git a/module/tutorial/lang/zh-cn.php b/module/tutorial/lang/zh-cn.php index 6ab07db9e5..28aa9bfe5c 100644 --- a/module/tutorial/lang/zh-cn.php +++ b/module/tutorial/lang/zh-cn.php @@ -40,6 +40,7 @@ $lang->tutorial->tasks['createAccount']['nav'] = array('app' => 'admin', 'modul $lang->tutorial->tasks['createAccount']['desc'] = "

在系统创建一个新的用户帐号：

"; $lang->tutorial->tasks['createProgram'] = array('title' => '创建项目集'); +$lang->tutorial->tasks['createProgram']['mode'] = 'new'; $lang->tutorial->tasks['createProgram']['nav'] = array('app' => 'program', 'module' => 'program', 'method' => 'create', 'menuModule' => 'program', 'menu' => 'browse', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-program-btn', 'targetPageName' => '添加项目集'); $lang->tutorial->tasks['createProgram']['desc'] = "

在系统创建一个新的项目集：

"; @@ -61,17 +62,24 @@ if($config->global->flow == 'full' or $config->global->flow == 'onlyStory') if($config->global->flow == 'full' or $config->global->flow == 'onlyTask') { $lang->tutorial->tasks['createProject'] = array('title' => '创建' . $lang->projectCommon); + $lang->tutorial->tasks['createProject']['mode'] = 'new'; $lang->tutorial->tasks['createProject']['nav'] = array('app' => 'project', 'module' => 'project', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->projectCommon); $lang->tutorial->tasks['createProject']['desc'] = "

在系统创建一个新的{$lang->projectCommon}：

"; $lang->tutorial->tasks['manageTeam'] = array('title' => "管理{$lang->projectCommon}团队"); - $lang->tutorial->tasks['manageTeam']['nav'] = array('app' => 'project', 'module' => 'project', 'method' => 'managemembers', 'menuModule' => 'settings', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectTableList>tr:first>.c-name>a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="members"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '团队管理'); + $lang->tutorial->tasks['manageTeam']['mode'] = 'new'; + $lang->tutorial->tasks['manageTeam']['nav'] = array('app' => 'project', 'module' => 'project', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectTableList>tr:first>.c-name>a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="members"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '团队管理'); $lang->tutorial->tasks['manageTeam']['desc'] = "

管理{$lang->projectCommon}团队成员：

"; $lang->tutorial->tasks['createExecution'] = array('title' => '创建' . $lang->executionCommon); $lang->tutorial->tasks['createExecution']['nav'] = array('app' => 'execution', 'module' => 'execution', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],.create-execution-btn', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-execution-btn', 'targetPageName' => '添加' . $lang->executionCommon); $lang->tutorial->tasks['createExecution']['desc'] = "

在系统创建一个新的{$lang->executionCommon}：

"; + $lang->tutorial->tasks['manageExecutionTeam'] = array('title' => "管理{$lang->executionCommon}团队"); + $lang->tutorial->tasks['manageExecutionTeam']['mode'] = 'classic'; + $lang->tutorial->tasks['manageExecutionTeam']['nav'] = array('app' => 'execution', 'module' => 'execution', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#executionTableList>tr:first>.c-name>a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="team"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '团队管理'); + $lang->tutorial->tasks['manageExecutionTeam']['desc'] = "

管理{$lang->executionCommon}团队成员：

"; + if($config->global->flow == 'full') { $lang->tutorial->tasks['linkStory'] = array('title' => "关联{$lang->SRCommon}"); diff --git a/module/tutorial/view/index.html.php b/module/tutorial/view/index.html.php index 6f499b21c1..3d834d5e8b 100644 --- a/module/tutorial/view/index.html.php +++ b/module/tutorial/view/index.html.php @@ -74,6 +74,7 @@ ?> tutorial->tasks as $name => $task):?>