From 3f9d1d2779bdfdf9021f2f4159f0941718fa7325 Mon Sep 17 00:00:00 2001 From: ovclas Date: Tue, 20 Sep 2011 06:00:09 +0000 Subject: [PATCH] issue 160 when add menu in sitemap, get module list change to trigger method. git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9219 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/menu/menu.admin.model.php | 13 +++++++++++++ modules/menu/menu.admin.view.php | 13 +------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php index 686b7b6fc..8b4de46e3 100644 --- a/modules/menu/menu.admin.model.php +++ b/modules/menu/menu.admin.model.php @@ -221,5 +221,18 @@ $this->add('tpl', str_replace("\n"," ",$tpl)); } + /** + * @brief when menu add in sitemap, select module list + * this menu showing with trigger + **/ + function getModuleListInSitemap() + { + // after trigger + $moduleList = array('page'); + $output = ModuleHandler::triggerCall('menu.getModuleListInSitemap', 'after', $moduleList); + if(!$output->toBool()) return $output; + + return $moduleList; + } } ?> diff --git a/modules/menu/menu.admin.view.php b/modules/menu/menu.admin.view.php index da71e4c9d..0fad744e7 100644 --- a/modules/menu/menu.admin.view.php +++ b/modules/menu/menu.admin.view.php @@ -139,18 +139,7 @@ Context::set('menu_list', $menuList); // get installed module list - $oModuleModel = &getModel('module'); - $output = $oModuleModel->getModuleList(); - if(is_array($output)) - { - $installedModuleList = array(); - foreach($output AS $key=>$value) - { - array_push($installedModuleList, $value->module); - } - $useModuleList = array('board', 'forum', 'wiki', 'page'); - } - $resultModuleList = array_intersect($installedModuleList, $useModuleList); + $resultModuleList = $oMenuAdminModel->getModuleListInSitemap(); Context::set('module_list', $resultModuleList); // get default group list