* Fix menu group.

This commit is contained in:
Yagami
2021-03-11 17:02:56 +08:00
parent 7d3d817e44
commit 20cf8a0c8d
3 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -664,6 +664,7 @@ $lang->navGroup->execution = 'execution';
$lang->navGroup->task = 'execution';
$lang->navGroup->build = 'execution';
$lang->navGroup->company = 'system';
$lang->navGroup->sqlbuilder = 'system';
$lang->navGroup->auditcl = 'system';
$lang->navGroup->cmcl = 'system';
@@ -685,7 +686,6 @@ $lang->navGroup->overtime = 'attend';
$lang->navGroup->lieu = 'attend';
$lang->navGroup->admin = 'admin';
$lang->navGroup->company = 'admin';
$lang->navGroup->dept = 'admin';
$lang->navGroup->user = 'admin';
$lang->navGroup->group = 'admin';
+4 -4
View File
@@ -48,6 +48,8 @@ class company extends control
*/
public function browse($browseType = 'inside', $param = 0, $type = 'bydept', $orderBy = 'id', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$this->lang->navGroup->company = 'admin';
$this->loadModel('search');
$this->lang->set('menugroup.company', 'company');
@@ -147,8 +149,7 @@ class company extends control
*/
public function view()
{
$this->lang->navGroup->company = 'system';
$this->lang->noMenuModule[] = 'company';
$this->lang->noMenuModule[] = 'company';
$this->company->setMenu();
$this->view->title = $this->lang->company->common . $this->lang->colon . $this->lang->company->view;
@@ -170,8 +171,7 @@ class company extends control
*/
public function dynamic($browseType = 'today', $param = '', $recTotal = 0, $date = '', $direction = 'next')
{
$this->lang->navGroup->company = 'system';
$this->lang->noMenuModule[] = 'company';
$this->lang->noMenuModule[] = 'company';
$this->company->setMenu();
$this->app->loadLang('user');
+1 -1
View File
@@ -122,7 +122,7 @@
{
if(['todo', 'team', 'calendar'].includes(methodLowerCase)) return 'system';
}
if(moduleName === 'company') if(methodLowerCase === 'dynamic' || methodLowerCase == 'view') return 'system';
if(moduleName === 'company') if(methodLowerCase == 'browse') return 'admin';
if(moduleName === 'tree')
{
if(methodLowerCase === 'browse')