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

issue 2522 mid is not requiable attribute.

Browse source 
menu_srl make a server side.


git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11448 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-09-24 02:32:29 +00:00
parent d1fb60cc36
commit 17ed6c08f2
2 changed files with 48 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -365,6 +365,35 @@
{
$request = Context::getRequestVars();
if(!$request->parent_srl || !$request->menu_name)
{
return new Object(-1, 'msg_invalid_request');
}
// set menu srl
$oMenuAdminModel = &getAdminModel('menu');
$itemInfo = $oMenuAdminModel->getMenuItemInfo($request->parent_srl);
// parent_srl is parent menu item's srl
if($itemInfo->menu_srl)
{
$request->menu_srl = $itemInfo->menu_srl;
}
// in this case, parent_srl is menu srl
else
{
$output = $oMenuAdminModel->getMenu($request->parent_srl);
if($output->menu_srl == $request->parent_srl)
{
$request->menu_srl = $output->menu_srl;
}
unset($output);
}
if(!$request->menu_srl)
{
return new Object(-1, 'msg_invalid_request');
}
// set menu variable
$args->menu_srl = $request->menu_srl;
$args->parent_srl = $request->parent_srl;
@ -393,7 +422,6 @@
$cmArgs->site_srl = (int)$site_module_info->site_srl;
$cmArgs->browser_title = $args->name;
$cmArgs->menu_srl = $request->menu_srl;
$cmArgs->mid = $request->mid;
switch ($request->module_type){
case 'WIDGET' :
@ -407,6 +435,13 @@
unset($cmArgs->page_type);
}
// if mid is empty, auto create mid
if(!$request->mid)
{
$request->mid = $cmArgs->module.'_'.date('YmdHis');
}
$cmArgs->mid = $request->mid;
$oModuleController = &getController('module');
$output = $oModuleController->insertModule($cmArgs);
@ -431,8 +466,9 @@
public function procMenuAdminUpdateItem()
{
$request = Context::getRequestVars();
debugPrint($request);
if(!$request->menu_item_srl || !$request->module_srl)
if(!$request->menu_item_srl || !$request->module_srl || !$request->mid)
{
return new Object(-1, 'msg_invalid_request');
}
@ -440,21 +476,25 @@
// Get original information
$oMenuAdminModel = &getAdminModel('menu');
$itemInfo = $oMenuAdminModel->getMenuItemInfo($request->menu_item_srl);
debugPrint($itemInfo);
exit;
// if menu type is module, check exists module
// if menu type is module, check exists module and update
if($itemInfo->is_shortcut != 'Y' && !preg_match('/^http/i',$itemInfo->url))
{
$oModuleModel = &getModel('module');
//$moduleInfo = $oModuleModel->getModuleInfoByModuleSrl($request->module_srl);
$moduleInfo = $oModuleModel->getModuleInfoByModuleSrl(1);
$moduleInfo = $oModuleModel->getModuleInfoByModuleSrl($request->module_srl);
//TODO if not exist module, return error
if(!$moduleInfo)
{
return new Object(-1, 'msg_invalid_request');
}
$moduleInfo->mid = $request->mid;
$oModuleController = &getController('module');
$oModuleController->updateModule($moduleInfo);
}
exit;
if($request->menu_name_key)
{
@ -465,10 +505,8 @@
$args->name = $request->menu_name;
}
//TODO discuss for mid name update able
//$args->url = ;
$itemInfo->url = $request->mid;
$itemInfo->name = $request->mid;
//$output = executeQuery('menu.updateMenuItem', $args);
}

2
modules/menu/ruleset/insertMenuItem.xml
View file

@ -3,8 +3,6 @@
<customrules>
</customrules>
<fields>
<field name="menu_srl" required="true" rule="number" />
<field name="menu_name" required="true" />
<field name="mid" required="true" />
</fields>
</ruleset>