merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -6,6 +6,7 @@
<column name="*" />
</columns>
<conditions>
<condition operation="equal" column="title" var="title" notnull="notnull" />
<condition operation="in" column="title" var="title" notnull="notnull" />
<condition operation="equal" column="site_srl" var="site_srl" default="0" pipe="and" />
</conditions>
</query>

View file

@ -0,0 +1,23 @@
<query id="getMenuItemByUrl" action="select">
<tables>
<table name="menu_item" alias="MI"/>
</tables>
<columns>
<column name="*" />
</columns>
<conditions>
<condition operation="equal" column="MI.url" var="url" notnull="notnull" />
<condition operation="equal" column="MI.is_shortcut" var="is_shortcut" defaut="N" pipe="and" />
<query operation="in" column="MI.menu_srl" notnull="notnull" alias="getSiteSrl" pipe="and" >
<tables>
<table name="menu" alias="M" />
</tables>
<columns>
<column name="menu_srl" />
</columns>
<conditions>
<condition operation="equal" column="M.site_srl" var = "site_srl" defaut = "0" notnull="notnull" />
</conditions>
</query>
</conditions>
</query>

View file

@ -7,9 +7,9 @@
</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" />
<index var="sort_index" default="listorder" order="desc" />
</navigation>
</query>

View file

@ -8,6 +8,7 @@
<column name="menu_srl" var="menu_srl" filter="number" notnull="notnull" />
<column name="name" var="name" notnull="notnull" />
<column name="url" var="url" />
<column name="is_shortcut" var="is_shortcut" notnull="notnull" default="N" />
<column name="open_window" var="open_window" />
<column name="expand" var="expand" />
<column name="normal_btn" var="normal_btn" />

View file

@ -3,8 +3,11 @@
<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="is_shortcut" var="is_shortcut" />
<column name="open_window" var="open_window" />
<column name="expand" var="expand" />
<column name="normal_btn" var="normal_btn" />

View file

@ -3,6 +3,7 @@
<table name="menu_item" />
</tables>
<columns>
<column name="menu_srl" var="menu_srl" />
<column name="parent_srl" var="parent_srl" />
<column name="listorder" var="listorder" />
</columns>