From b72f3f5db3d9eb6d6ed58e944c06c7b3c467f090 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 3 Sep 2019 14:31:48 +0800
Subject: [PATCH]  * code for tutorial.

---
 module/common/model.php    | 6 ++++--
 module/project/js/story.js | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 75a05a92a7..ced20d4eb0 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -547,8 +547,8 @@ class commonModel extends model
 
         /* get current module and method. */
         $isTutorialMode = commonModel::isTutorialMode();
-        $currentModule  = ($isTutorialMode and defined('WIZARD_MODULE')) ? WIZARD_MODULE : $app->getModuleName();
-        $currentMethod  = ($isTutorialMode and defined('WIZARD_METHOD')) ? WIZARD_METHOD : $app->getMethodName();
+        $currentModule  = $app->getModuleName();
+        $currentMethod  = $app->getMethodName();
         $menu           = customModel::getModuleMenu($moduleName);
         $isMobile       = $app->viewType === 'mhtml';
 
@@ -558,6 +558,8 @@ class commonModel extends model
             $currentModule  = $app->rawModule;
             $currentMethod  = $app->rawMethod;
         }
+        if($isTutorialMode and defined('WIZARD_MODULE')) $currentModule  = WIZARD_MODULE;
+        if($isTutorialMode and defined('WIZARD_METHOD')) $currentMethod  = WIZARD_METHOD;
 
         /* The beginning of the menu. */
         echo $isMobile ? '' : "<ul class='nav nav-default'>\n";
diff --git a/module/project/js/story.js b/module/project/js/story.js
index abfaa7b778..7381ef20e0 100644
--- a/module/project/js/story.js
+++ b/module/project/js/story.js
@@ -16,7 +16,6 @@ $(function()
 
     $('#module' + moduleID).parent().addClass('active');
     $('#product' + productID).addClass('active');
-    $('#branch' + branchID).addClass('active');
     $(document).on('click', "#storyList tbody tr, .table-footer .check-all, #storyList thead .check-all", function(){showCheckedSummary();});
     $(document).on('change', "#storyList :checkbox", function(){showCheckedSummary();});