From 2df7e608a050eae8a7147a35f34afe5af77a230a Mon Sep 17 00:00:00 2001
From: Hao Sun <sunhao@easycorp.ltd>
Date: Tue, 7 Sep 2021 20:01:53 +0800
Subject: [PATCH] * fix project/managemembers not work in tutorial mode.

---
 module/project/view/managemembers.html.php | 16 +++++++++++++---
 module/tutorial/lang/en.php                |  2 +-
 module/tutorial/lang/zh-cn.php             |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php
index 80e1e53b78..5c69b19a79 100644
--- a/module/project/view/managemembers.html.php
+++ b/module/project/view/managemembers.html.php
@@ -107,9 +107,19 @@
       <tfoot>
         <tr>
           <td colspan='6' class='text-center form-actions'>
-            <?php echo html::hidden('removeExecution', 'no');?>
-            <?php echo html::submitButton('', '', 'hidden btn btn-wide btn-primary');?>
-            <?php echo html::commonButton($lang->save, 'onclick="saveMemebers()" id="saveBtn"', 'btn btn-wide btn-primary') . html::backButton();?>
+            <?php
+              echo html::hidden('removeExecution', 'no');
+              if(commonModel::isTutorialMode())
+              {
+                  echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary');
+              }
+              else
+              {
+                  echo html::submitButton('', '', 'hidden btn btn-wide btn-primary');
+                  echo html::commonButton($lang->save, 'onclick="saveMemebers()" id="saveBtn"', 'btn btn-wide btn-primary');
+              }
+              echo html::backButton();
+            ?>
           </td>
         </tr>
       </tfoot>
diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php
index 7e48748630..021fa6e783 100644
--- a/module/tutorial/lang/en.php
+++ b/module/tutorial/lang/en.php
@@ -69,7 +69,7 @@ if($config->global->flow == 'full' or $config->global->flow == 'onlyTask')
 
     $lang->tutorial->tasks['manageTeam']         = array('title' => "Manage {$lang->projectCommon} Team");
     $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' => 'accounts1', 'submit' => '#saveBtn', 'targetPageName' => 'Manage team members');
+    $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' => 'accounts1', 'submit' => '#submit', 'targetPageName' => 'Manage team members');
     $lang->tutorial->tasks['manageTeam']['desc'] = "<p>Manage {$lang->projectCommon} team members: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Team <i class='icon icon-angle-right'></i> Manage Team Members</span> Page；</li><li data-target='form'>Choose users for the team.</li><li data-target='submit'>Save</li></ul>";
 
     $lang->tutorial->tasks['createExecution']         = array('title' => 'Create a ' . $lang->executionCommon);
diff --git a/module/tutorial/lang/zh-cn.php b/module/tutorial/lang/zh-cn.php
index 13f234a83c..e14455e810 100644
--- a/module/tutorial/lang/zh-cn.php
+++ b/module/tutorial/lang/zh-cn.php
@@ -68,7 +68,7 @@ if($config->global->flow == 'full' or $config->global->flow == 'onlyTask')
 
     $lang->tutorial->tasks['manageTeam']         = array('title' => "管理{$lang->projectCommon}团队");
     $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' => 'accounts1', 'submit' => '#saveBtn', 'targetPageName' => '团队管理');
+    $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' => 'accounts1', 'submit' => '#submit', 'targetPageName' => '团队管理');
     $lang->tutorial->tasks['manageTeam']['desc'] = "<p>管理{$lang->projectCommon}团队成员：</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> 设置 <i class='icon icon-angle-right'></i> 团队 <i class='icon icon-angle-right'></i> 团队管理</span> 页面；</li><li data-target='form'>选择要加入团队的成员；</li><li data-target='submit'>保存团队成员信息。</li></ul>";
 
     $lang->tutorial->tasks['createExecution']         = array('title' => '创建' . $lang->executionCommon);