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

* [bug#51149,done,3h,0h] Merge workflow mainNav before setOpenAdd function.

Browse Source
This commit is contained in:
wangyuting
2024-06-17 16:41:00 +08:00
committed by 刘刚
parent a093f7d83f
commit c4958b368b
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/router.class.php
+3 -16
View File
@@ -1224,24 +1224,11 @@ class baseRouter
*/
public function setOpenApp()
{
if(isset($this->config->zin))
{
$module = $this->rawModule;
$tab = '';
if(isset($_SERVER['HTTP_X_ZIN_APP'])) $tab = $_SERVER['HTTP_X_ZIN_APP'];
elseif(isset($_COOKIE['tab']) && $_COOKIE['tab'] && preg_match('/^\w+$/', $_COOKIE['tab'])) $tab = $_COOKIE['tab'];
elseif(isset($this->lang->navGroup)) $tab = zget($this->lang->navGroup, $module, 'my');
if(!isset($this->lang->mainNav->{$tab}) && !isset($_SERVER['HTTP_X_ZIN_APP'])) $tab = '';
$this->tab = empty($tab) ? 'my' : $tab;
return;
}
$module = $this->rawModule;
$this->tab = 'my';
if(isset($this->lang->navGroup) && $module) $this->tab = zget($this->lang->navGroup, $module, 'my');
if(isset($_COOKIE['tab']) and $_COOKIE['tab'] and preg_match('/^\w+$/', (string) $_COOKIE['tab'])) $this->tab = $_COOKIE['tab'];
if(isset($this->lang->navGroup)) $this->tab = zget($this->lang->navGroup, $module, 'my');
if(isset($_COOKIE['tab']) && $_COOKIE['tab'] && preg_match('/^\w+$/', $_COOKIE['tab'])) $this->tab = $_COOKIE['tab'];
if(isset($this->config->zin) && isset($_SERVER['HTTP_X_ZIN_APP'])) $this->tab = $_SERVER['HTTP_X_ZIN_APP'];
if(!isset($this->lang->mainNav->{$this->tab})) $this->tab = 'my';
}
framework/router.class.php
+16
View File
@@ -153,6 +153,8 @@ class router extends baseRouter
}
}
if($this->config->edition != 'open') $this->mergeFlowLang();
/* Merge from the db lang. */
if($moduleName != 'common' and isset($lang->db->custom[$moduleName]))
{
@@ -207,6 +209,20 @@ class router extends baseRouter
return $lang;
}
/**
* Merge workflow mainNav Lang.
*
* @access public
* @return void
*/
public function mergeFlowLang()
{
if(defined('IN_UPGRADE')) return;
$flows = $this->dbQuery('SELECT * FROM ' . TABLE_WORKFLOW . " WHERE `buildin` = 0 AND `vision` = '{$this->config->vision}' AND status = 'normal' AND type = 'flow' AND `navigator` = 'primary'")->fetchAll();
foreach($flows as $flow) $this->lang->mainNav->{$flow->module} = "{$this->lang->navIcons['workflow']} {$flow->name}|{$flow->module}|browse|";
}
/**
* Set common lang.
*