issue 2498 new admin menu develop

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11318 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-09-18 13:00:18 +00:00
parent 4b4fc419a8
commit 8aafc130ab
10 changed files with 196 additions and 52 deletions

View file

@ -9,6 +9,7 @@
<action name="dispMenuAdminManagement" type="view" standalone="true" />
<action name="dispMenuAdminMidList" type="view" standalone="true" />
<action name="dispMenuAdminSiteMap" type="view" standalone="true" admin_index="true" menu_name="siteMap" menu_index="true" />
<action name="dispMenuAdminSiteDesign" type="view" standalone="true" menu_name="siteDesign" />
<action name="getMenuAdminTplInfo" type="model" standalone="true" />
<action name="getMenuAdminItemInfo" type="model" standalone="true" />
@ -34,7 +35,7 @@
<menus>
<menu name="siteMap">
<title xml:lang="en">Menu Management</title>
<title xml:lang="ko">사이트</title>
<title xml:lang="ko">사이트 메뉴 편집</title>
<title xml:lang="jp">サイトマップ</title>
<title xml:lang="zh-CN">Menu Management</title>
<title xml:lang="zh-TW">選單管理</title>
@ -45,5 +46,9 @@
<title xml:lang="mn">Menu Management</title>
<title xml:lang="tr">Menu Management</title>
</menu>
<menu name="siteDesign">
<title xml:lang="en">Menu Management</title>
<title xml:lang="ko">사이트 디자인 설정</title>
</menu>
</menus>
</module>

View file

@ -87,7 +87,8 @@
$oMenuAdminModel = &getAdminModel('menu');
$menu_info = $oMenuAdminModel->getMenu($menu_srl);
if($menu_info->title == '__XE_ADMIN__')
$oAdmin = &getClass('admin');
if($menu_info->title == $oAdmin->getAdminMenuName())
return new Object(-1, 'msg_adminmenu_cannot_delete');
$this->deleteMenu($menu_srl);
@ -377,7 +378,8 @@
// Get original information
$item_info = $oMenuAdminModel->getMenuItemInfo($args->menu_item_srl);
if($menu_title == '__XE_ADMIN__' && $item_info->parent_srl == 0)return $this->stop('msg_cannot_delete_for_admin_topmenu');
$oAdmin = &getClass('admin');
if($menu_title == $oAdmin->getAdminMenuName() && $item_info->parent_srl == 0)return $this->stop('msg_cannot_delete_for_admin_topmenu');
if($item_info->parent_srl) $parent_srl = $item_info->parent_srl;
// Display an error that the category cannot be deleted if it has a child node

View file

@ -331,9 +331,10 @@
$menuListFromDB = $this->getMenus();
if(is_array($menuListFromDB))
{
$oAdmin = &getClass('admin');
foreach($menuListFromDB AS $key=>$value)
{
if($value->title == '__XE_ADMIN__') unset($output[$key]);
if($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
else
{
unset($menu);

View file

@ -137,6 +137,8 @@
else $site_srl = (int)$site_module_info->site_srl;
}
$oAdmin = &getClass('admin');
$oMenuAdminModel = &getAdminModel('menu');
$menuListFromDB = $oMenuAdminModel->getMenus();
$output = $menuListFromDB;
@ -147,7 +149,7 @@
$menuItems = array();
foreach($output AS $key=>$value)
{
if($value->title == '__XE_ADMIN__') unset($output[$key]);
if($value->title == $oAdmin->getAdminMenuName()) unset($output[$key]);
else
{
unset($menu);

View file

@ -7,7 +7,7 @@
</columns>
<conditions>
<condition operation="equal" column="site_srl" var="site_srl" filter="number" />
<condition operation="notequal" column="title" default="__XE_ADMIN__" pipe="and" />
<condition operation="notequal" column="title" default="__ADMINMENU_V17__" pipe="and" />
</conditions>
<navigation>
<index var="sort_index" default="listorder" order="asc" />

View file

@ -3,6 +3,8 @@
<table name="menu_item" />
</tables>
<columns>
<column name="menu_srl" var="menu_srl" />
<column name="parent_srl" var="parent_srl" />
<column name="name" var="name" notnull="notnull" />
<column name="url" var="url" />
<column name="open_window" var="open_window" />