From 3d8523f229174911d50d9498f128c60db3833270 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 16 Apr 2007 09:19:13 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1169
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/menu/queries/deleteMenu.xml       | 6 +++---
 modules/menu/queries/deleteMenus.xml      | 4 ++--
 modules/menu/queries/getMenu.xml          | 2 +-
 modules/menu/queries/getMenuList.xml      | 4 ++--
 modules/menu/queries/insertMenu.xml       | 3 +--
 modules/menu/queries/updateMenu.xml       | 2 +-
 modules/menu/queries/updateMenuParent.xml | 2 +-
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/modules/menu/queries/deleteMenu.xml b/modules/menu/queries/deleteMenu.xml
index 98842b5ee..aca40ac0e 100644
--- a/modules/menu/queries/deleteMenu.xml
+++ b/modules/menu/queries/deleteMenu.xml
@@ -1,8 +1,8 @@
-<query id="deleteLayoutMenu" action="delete">
+<query id="deleteMenu" action="delete">
     <tables>
-        <table name="menu" />
+        <table name="menu_item" />
     </tables>
     <conditions>
-        <condition operation="equal" column="menu_srl" var="menu_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="menu_item_srl" var="menu_item_srl" filter="number" notnull="notnull" />
     </conditions>
 </query>
diff --git a/modules/menu/queries/deleteMenus.xml b/modules/menu/queries/deleteMenus.xml
index b46ce1ba3..a1edf3d8e 100644
--- a/modules/menu/queries/deleteMenus.xml
+++ b/modules/menu/queries/deleteMenus.xml
@@ -1,8 +1,8 @@
-<query id="deleteLayoutMenus" action="delete">
+<query id="deleteMenus" action="delete">
     <tables>
         <table name="menu" />
     </tables>
     <conditions>
-        <condition operation="equal" column="layout_srl" var="layout_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="menu_srl" var="menu_srl" filter="number" notnull="notnull" />
     </conditions>
 </query>
diff --git a/modules/menu/queries/getMenu.xml b/modules/menu/queries/getMenu.xml
index 809a04c1d..670e2b60a 100644
--- a/modules/menu/queries/getMenu.xml
+++ b/modules/menu/queries/getMenu.xml
@@ -1,4 +1,4 @@
-<query id="getLayoutMenu" action="select">
+<query id="getMenu" action="select">
     <tables>
         <table name="menu" />
     </tables>
diff --git a/modules/menu/queries/getMenuList.xml b/modules/menu/queries/getMenuList.xml
index 35151deba..a8be6793d 100644
--- a/modules/menu/queries/getMenuList.xml
+++ b/modules/menu/queries/getMenuList.xml
@@ -1,4 +1,4 @@
-<query id="getLayoutMenuList" action="select">
+<query id="getMenuList" action="select">
     <tables>
         <table name="menu" />
     </tables>
@@ -6,7 +6,7 @@
         <column name="*" />
     </columns>
     <conditions>
-        <condition operation="equal" column="layout_srl" var="layout_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="menu_srl" var="menu_srl" filter="number" notnull="notnull" />
         <condition operation="equal" column="menu_id" var="menu_id" notnull="notnull" pipe="and" />
     </conditions>
     <navigation>
diff --git a/modules/menu/queries/insertMenu.xml b/modules/menu/queries/insertMenu.xml
index c415fc887..8f0e7a186 100644
--- a/modules/menu/queries/insertMenu.xml
+++ b/modules/menu/queries/insertMenu.xml
@@ -1,11 +1,10 @@
-<query id="insertLayoutMenu" action="insert">
+<query id="insertMenu" action="insert">
     <tables>
         <table name="menu" />
     </tables>
     <columns>
         <column name="menu_srl" var="menu_srl" filter="number" notnull="notnull" />
         <column name="parent_srl" var="parent_srl" filter="number" default="0" />
-        <column name="layout_srl" var="layout_srl" filter="number" notnull="notnull" />
         <column name="menu_id" var="menu_id" filter="number" notnull="notnull" />
         <column name="name" var="name" notnull="notnull" />
         <column name="url" var="url" />
diff --git a/modules/menu/queries/updateMenu.xml b/modules/menu/queries/updateMenu.xml
index d4a0f7808..ff4aaf6ea 100644
--- a/modules/menu/queries/updateMenu.xml
+++ b/modules/menu/queries/updateMenu.xml
@@ -1,4 +1,4 @@
-<query id="updateLayoutMenu" action="update">
+<query id="updateMenu" action="update">
     <tables>
         <table name="menu" />
     </tables>
diff --git a/modules/menu/queries/updateMenuParent.xml b/modules/menu/queries/updateMenuParent.xml
index 433524db1..d531f1ce3 100644
--- a/modules/menu/queries/updateMenuParent.xml
+++ b/modules/menu/queries/updateMenuParent.xml
@@ -1,4 +1,4 @@
-<query id="updateLayoutMenuParent" action="update">
+<query id="updateMenuParent" action="update">
     <tables>
         <table name="menu" />
     </tables>