fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 03:32:00 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 160 when menu add or modify in sitemap.

Browse source 
page type can selectable


git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9255 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-09-21 09:19:29 +00:00
parent a67c1740b0
commit ad6463e9ae
6 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/menu/menu.admin.controller.php
View file

@ -149,8 +149,19 @@
$cmArgs->site_srl = (int)$site_module_info->site_srl;
$cmArgs->mid = $source_args->create_menu_url;
$cmArgs->browser_title = $source_args->menu_name;
//$cmArgs->layout_srl = $this->selected_layout->layout_srl;
switch ($source_args->module_type){
case 'WIDGET' :
case 'ARTICLE' :
case 'OUTSIDE' :
$cmArgs->module = 'page';
$cmArgs->page_type = $source_args->module_type;
break;
default:
$cmArgs->module = $source_args->module_type;
unset($cmArgs->page_type);
}
$cmArgs->menu_srl = $source_args->menu_srl;
$oModuleController = &getController('module');
$output = $oModuleController->insertModule($cmArgs);

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

@ -125,16 +125,10 @@
$moduleInfo = $oModuleModel->getModuleInfoByMid($menuItem->url);
if($moduleInfo->mid == $menuItem->url) {
$menuItem->moduleType = $moduleInfo->module;
//$menuItem->module_id = $moduleInfo->mid;
//$menuItem->browser_title = $moduleInfo->browser_title;
//unset($menuItem->url);
$menuItem->pageType = $moduleInfo->page_type;
}
}
else
{
$menuItem->moduleType = 'url';
/*$menuItem->url = preg_replace('/^(http|https):\/\//i','',$menuItem->url);*/
}
else $menuItem->moduleType = 'url';
// get groups
$oMemberModel = &getModel('member');

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

@ -139,6 +139,7 @@
Context::set('menu_list', $menuList);
// get installed module list
$oPageController = &getController('page'); //for lang
$resultModuleList = $oMenuAdminModel->getModuleListInSitemap();
Context::set('module_list', $resultModuleList);

5
modules/menu/tpl/js/sitemap.js
View file

@ -46,6 +46,7 @@ $('form.siteMap')
editForm.find('input[name=menu_name]').val(menuItem.name);
var moduleType = menuItem.moduleType;
if(menuItem.pageType) moduleType = menuItem.pageType;
var inputCType = editForm.find('input[name=cType]');
if(moduleType == 'url')
@ -171,8 +172,10 @@ $('form.siteMap')
function completeGetModuleList(ret_obj)
{
var midList = ret_obj.module_list[$('#kModule').val()].list;
var module = $('#kModule').val();
if(module == 'WIDGET' || module == 'ARTICLE' || module == 'OUTSIDE') module = 'page';
var midList = ret_obj.module_list[module].list;
var htmlBuffer = "";
for(x in midList)
{

7
modules/menu/tpl/sitemap.html
View file

@ -98,7 +98,12 @@ xe.lang.confirm_delete = "{$lang->confirm_delete}";
<p class="q"><label for="kModule">{$lang->select_module}</label></p>
<p class="a">
<select style="width:290px" id="kModule" name="module_type">
<option loop="$module_list=>$key,$value" value="{$key}">{$value->title}</option>
<optgroup label="page" cond="$key=='page'">
<option value="WIDGET">{$lang->page_type_name['WIDGET']}</option>
<option value="ARTICLE">{$lang->page_type_name['ARTICLE']}</option>
<option value="OUTSIDE">{$lang->page_type_name['OUTSIDE']}</option>
</optgroup>
<option loop="$module_list=>$key,$value" value="{$key}" cond="$key!='page'">{$value->title}</option>
</select>
</p>
</li>

4
modules/page/conf/module.xml
View file

@ -11,9 +11,9 @@
<action name="dispPageIndex" type="view" index="true" />
<action name="dispPageAdminContent" type="view" admin_index="true" standalone="true" />
<action name="dispPageAdminGrantInfo" type="view" standalone="true" />
<action name="dispPageAdminInfo" type="view" standalone="true" />
<action name="dispPageAdminInfo" type="view" standalone="true" setup_index="true" />
<action name="dispPageAdminPageAdditionSetup" type="view" standalone="true" />
<action name="dispPageAdminInsert" type="view" standalone="true" setup_index="true" />
<action name="dispPageAdminInsert" type="view" standalone="true" />
<action name="dispPageAdminDelete" type="view" standalone="true" />
<action name="dispPageAdminContentModify" type="view" standalone="true" />
<action name="dispPageAdminAddContent" type="view" standalone="true" />