Merge branch release/21.7.5 of zentao/zentaopms (#11204)
This commit is contained in:
@@ -365,7 +365,7 @@ class header extends wg
|
||||
{
|
||||
$params = "model=kanban";
|
||||
}
|
||||
else if(!defined('TUTORIAL'))
|
||||
elseif(!commonModel::isTutorialMode())
|
||||
{
|
||||
$params = "programID=0&from=global";
|
||||
$createMethod = 'createGuide';
|
||||
|
||||
@@ -29,7 +29,7 @@ class navbar extends wg
|
||||
|
||||
protected function getExecutionMoreItem($executionID)
|
||||
{
|
||||
if(defined('TUTORIAL')) return;
|
||||
if(commonModel::isTutorialMode()) return;
|
||||
|
||||
global $lang, $app;
|
||||
|
||||
@@ -106,7 +106,8 @@ class navbar extends wg
|
||||
|
||||
protected function getAppBtnItem()
|
||||
{
|
||||
if(defined('TUTORIAL')) return;
|
||||
if(commonModel::isTutorialMode()) return;
|
||||
|
||||
global $app, $config, $lang;
|
||||
|
||||
$condition = '';
|
||||
|
||||
@@ -102,6 +102,7 @@ div
|
||||
set::localPager(),
|
||||
set::footPager($pagerSetting),
|
||||
set::footer(array('flex', 'pager')),
|
||||
$type == 'productRelease' ? set::rowKey('rowID') : null,
|
||||
$type == 'productRelease' ? set::plugins(array('cellspan')) : null,
|
||||
$type == 'productRelease' ? set::getCellSpan(jsRaw('window.getCellSpan')) : null
|
||||
) : null,
|
||||
|
||||
Reference in New Issue
Block a user