fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-11 04:52:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 1617 remove virtual site module in module list

Browse source 
so, if virtual site module, set external link setting in menu


git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10406 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-03-09 09:16:43 +00:00
parent 5410dc9e92
commit 89f224420c
4 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/menu/menu.admin.model.php
View file

@ -237,13 +237,13 @@
* @brief when menu add in sitemap, select module list * @brief when menu add in sitemap, select module list
* this menu showing with trigger * this menu showing with trigger
**/ **/
function getModuleListInSitemap() function getModuleListInSitemap($site_srl = 0)
{ {
$oModuleModel = &getModel('module'); $oModuleModel = &getModel('module');
$columnList = array('module'); $columnList = array('module');
$moduleList = array('page'); $moduleList = array('page');
$output = $oModuleModel->getModuleListByInstance($columnList); $output = $oModuleModel->getModuleListByInstance($site_srl, $columnList);
if(is_array($output->data)) if(is_array($output->data))
{ {
foreach($output->data AS $key=>$value) foreach($output->data AS $key=>$value)

11
modules/menu/menu.admin.view.php
View file

@ -119,6 +119,15 @@
function dispMenuAdminSiteMap() function dispMenuAdminSiteMap()
{ {
Context::loadLang(_XE_PATH_.'modules/document/lang/'); Context::loadLang(_XE_PATH_.'modules/document/lang/');
$site_srl = Context::get('site_srl');
$site_module_info = Context::get('site_module_info');
if(!$site_srl)
{
if($logged_info->is_admin == 'Y' && !$site_keyword) $site_srl = 0;
else $site_srl = (int)$site_module_info->site_srl;
}
$oMenuAdminModel = &getAdminModel('menu'); $oMenuAdminModel = &getAdminModel('menu');
$menuListFromDB = $oMenuAdminModel->getMenus(); $menuListFromDB = $oMenuAdminModel->getMenus();
if(is_array($menuListFromDB)) $output = array_reverse($menuListFromDB); if(is_array($menuListFromDB)) $output = array_reverse($menuListFromDB);
@ -158,7 +167,7 @@
// get installed module list // get installed module list
$oPageController = &getController('page'); //for lang $oPageController = &getController('page'); //for lang
$resultModuleList = $oMenuAdminModel->getModuleListInSitemap(); $resultModuleList = $oMenuAdminModel->getModuleListInSitemap($site_srl);
Context::set('module_list', $resultModuleList); Context::set('module_list', $resultModuleList);
// get default group list // get default group list

3
modules/module/module.model.php
View file

@ -1566,8 +1566,9 @@
/** /**
* @brief already instance created module list * @brief already instance created module list
**/ **/
function getModuleListByInstance($columnList = array()) function getModuleListByInstance($site_srl = 0, $columnList = array())
{ {
$args->site_srl = $site_srl;
$output = executeQueryArray('module.getModuleListByInstance', $args, $columnList); $output = executeQueryArray('module.getModuleListByInstance', $args, $columnList);
return $output; return $output;
} }

3
modules/module/queries/getModuleListByInstance.xml
View file

@ -5,6 +5,9 @@
<columns> <columns>
<column name="*" /> <column name="*" />
</columns> </columns>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" filter="number" />
</conditions>
<groups> <groups>
<group column="module" /> <group column="module" />
</groups> </groups>