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

* Add case of dev module.

Browse Source
This commit is contained in:
caoyanyi
2023-02-24 10:41:31 +08:00
parent 0729762ffa
commit 3bb618093c
4 changed files with 81 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/dev/model.php
+3 -3
View File
@@ -305,7 +305,7 @@ class devModel extends model
*/
public function getNavLang($type, $module, $method, $language = 'zh-cn', $defaultLang = null)
{
if(empty($defaultLang)) $defaultLang = $this->loadDefaultLang();
if(empty($defaultLang)) $defaultLang = $this->loadDefaultLang($language);
$menus = new stdclass();
if($type == 'second')
@@ -339,7 +339,7 @@ class devModel extends model
}
else
{
$menus = $type == 'third' ? $defaultLang->$module->menu->{$method}['subMenu'] : $defaultLang->mainNav;
$menus = ($type == 'third' and isset($defaultLang->$module->menu->{$method}['subMenu'])) ? $defaultLang->$module->menu->{$method}['subMenu'] : $defaultLang->mainNav;
}
return $menus;
@@ -505,7 +505,7 @@ class devModel extends model
public function loadDefaultLang($language = 'zh-cn', $module = 'common')
{
$clientLang = $this->app->clientLang;
if($language != $clientLang) $this->app->clientLang = $language;
if($language and $language != $clientLang) $this->app->clientLang = $language;
$langFilesToLoad = $this->app->getMainAndExtFiles($module);
if($language != $clientLang) $this->app->clientLang = $clientLang;