From 9033eac789be4a86d79e12492094388906ff8674 Mon Sep 17 00:00:00 2001 From: ovclas Date: Mon, 22 Oct 2012 07:22:08 +0000 Subject: [PATCH] issue 2611 menu detail setting develop. git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11815 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/module/ModuleHandler.class.php | 6 +++++ modules/menu/conf/module.xml | 1 + modules/menu/menu.admin.model.php | 31 ++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php index 31ff340da..219101c00 100644 --- a/classes/module/ModuleHandler.class.php +++ b/classes/module/ModuleHandler.class.php @@ -684,6 +684,12 @@ if(file_exists($edited_layout)) $oModule->setEditedLayoutFile($edited_layout); } } + $isLayoutDrop = Context::get('isLayoutDrop'); + if($isLayoutDrop) + { + $oModule->setLayoutPath('common/tpl'); + $oModule->setLayoutFile('default_layout'); + } } // Display contents diff --git a/modules/menu/conf/module.xml b/modules/menu/conf/module.xml index 6513a43b1..bbbfd72bc 100644 --- a/modules/menu/conf/module.xml +++ b/modules/menu/conf/module.xml @@ -16,6 +16,7 @@ + diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php index 2f5996725..660dd4c6b 100644 --- a/modules/menu/menu.admin.model.php +++ b/modules/menu/menu.admin.model.php @@ -399,6 +399,37 @@ $this->add('menuList', $menuList); } + /** + * Get module's detail setup contents + * @return void + */ + public function getMenuAdminDetailSetup() + { + $menuItemSrl = Context::get('menu_item_srl'); + if(!$menuItemSrl) + { + return new Object(-1, 'msg_invalid_request'); + } + + $menuItemInfo = $this->getMenuItemInfo($menuItemSrl); + + // if menu is shortcut + if($menuItemInfo->is_shortcut == 'Y') + { + return new Object(-1, 'msg_invalid_request'); + } + + // get module info + $oModuleModel = &getModel('module'); + $moduleInfo = $oModuleModel->getModuleInfoByMid($menuItemInfo->url); + + // get xml info + $moduleConfInfo = $oModuleModel->getModuleInfoXml($moduleInfo->module); + + $setupUrl = getNotEncodedUrl('', 'module', 'admin', 'act', $moduleConfInfo->setup_index_act, 'module_srl', $moduleInfo->module_srl, 'isLayoutDrop', '1'); + $this->add('setupUrl', $setupUrl); + } + /** * Setting menu information(recursive) * @param array $menu