#225 temporary menu 처리

This commit is contained in:
khongchi 2014-01-29 15:12:10 +09:00
parent bd4372aff9
commit 5b063c10ad
2 changed files with 43 additions and 31 deletions

View file

@ -121,31 +121,6 @@ class menuAdminController extends menu
$output = $this->updateLinkModule($unlinked_modules, $unlinked_menu_srl); $output = $this->updateLinkModule($unlinked_modules, $unlinked_menu_srl);
} }
/* // for 1.7.4 update, 기존에 생성된 Temporary menu 항목 정리
$oMenuAdminModel = getAdminModel('menu');
$args = new stdClass();
$args->title = array("Temporary menu");
$temp_menus = executeQueryArray('menu.getMenuByTitle', $args);
$args = new stdClass();
if($temp_menus->toBool())
{
foreach($temp_menus->data as $menu)
{
$args->current_menu_srl = $menu->menu_srl;
$args->menu_srl = $moduleConfig->unlinked_menu_srl;
$output3 = executeQuery('menu.updateMenuItems', $args);
if($output3->toBool())
{
// delete
$oMenuAdminController = getAdminController('menu');
$oMenuAdminController->deleteMenu($menu->menu_srl);
}
}
}
*/
} }
function getUnlinkedMenu() function getUnlinkedMenu()
@ -231,14 +206,15 @@ class menuAdminController extends menu
$output = executeQuery('module.updateModule', $moduleInfo); $output = executeQuery('module.updateModule', $moduleInfo);
$oCacheHandler = CacheHandler::getInstance('object', null, true);
if($oCacheHandler->isSupport())
{
$oCacheHandler->invalidateGroupKey('site_and_module');
}
return $output; return $output;
} }
$oCacheHandler = CacheHandler::getInstance('object', null, true);
if($oCacheHandler->isSupport())
{
$oCacheHandler->invalidateGroupKey('site_and_module');
}
$oMenuAdminController = getAdminController('menu'); $oMenuAdminController = getAdminController('menu');
$oMenuAdminController->makeXmlFile($menuSrl); $oMenuAdminController->makeXmlFile($menuSrl);

View file

@ -39,6 +39,15 @@ class menu extends ModuleObject
{ {
return TRUE; return TRUE;
} }
$oMenuAdminModel = getAdminModel('menu');
$args = new stdClass();
$args->title = array("Temporary menu");
$temp_menus = executeQueryArray('menu.getMenuByTitle', $args);
if($temp_menus->toBool() && count($temp_menus->data)) return true;
return false; return false;
} }
@ -136,6 +145,33 @@ class menu extends ModuleObject
$this->recompileCache(); $this->recompileCache();
} }
// for 1.7.4 update, 기존에 생성된 Temporary menu 항목 정리
$oMenuAdminModel = getAdminModel('menu');
$args = new stdClass();
$args->title = array("Temporary menu");
$temp_menus = executeQueryArray('menu.getMenuByTitle', $args);
$args = new stdClass();
if($temp_menus->toBool() && count($temp_menus->data))
{
$oMenuAdminController = getAdminController('menu');
foreach($temp_menus->data as $menu)
{
$args->current_menu_srl = $menu->menu_srl;
$args->menu_srl = $oMenuAdminController->getUnlinkedMenu();
$output3 = executeQuery('menu.updateMenuItems', $args);
if($output3->toBool())
{
// delete
$oMenuAdminController->deleteMenu($menu->menu_srl);
}
}
$this->recompileCache();
}
return new Object(0, 'success_updated'); return new Object(0, 'success_updated');
} }