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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Yagami
2019-09-03 15:35:13 +08:00
parent 51fc8211a9 b72f3f5db3
commit 95b38298e0
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+4 -2
View File
@@ -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";
module/project/js/story.js
-1
View File
@@ -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();});