Skip to content

erp5
erp5
Commit 421302e3 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

remove unused z_search_folder ZSQL method

parent 8f877973
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 290 deletions
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_folder.xml deleted 100644 → 0
View file @ 8f877973
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="SQL" module="Products.ZSQLMethods.SQL"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>sort_on\r\n
query\r\n
parent_uid</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
<value> <int>10</int> </value>
</item>
<item>
<key> <string>class_file_</string> </key>
<value> <string>ZSQLCatalog.zsqlbrain</string> </value>
</item>
<item>
<key> <string>class_name_</string> </key>
<value> <string>ZSQLBrain</string> </value>
</item>
<item>
<key> <string>connection_hook</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>connection_id</string> </key>
<value> <string>erp5_sql_connection</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>z_search_folder</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
<value> <int>100</int> </value>
</item>
<item>
<key> <string>max_rows_</string> </key>
<value> <int>1000</int> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
<dtml-if sort_on>\n
<dtml-if query>\n
SELECT DISTINCT catalog.* FROM catalog, category, roles_and_users WHERE catalog.uid=category.uid AND catalog.uid=roles_and_users.uid AND <dtml-var query> AND <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> ORDER BY <dtml-var sort_on>\n
<dtml-else>\n
SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> ORDER BY <dtml-var sort_on>\n
</dtml-if>\n
<dtml-else>\n
<dtml-if query>\n
SELECT DISTINCT catalog.* FROM catalog, category, roles_and_users WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> AND catalog.uid=category.uid AND catalog.uid=roles_and_users.uid AND <dtml-var query>\n
<dtml-else>\n
SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int>\n
</dtml-if>\n
</dtml-if>
]]></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/bt/template_catalog_method_id_list
View file @ 421302e3
...@@ -127,7 +127,6 @@ erp5_mysql_innodb/z_related_translated_validation_state_title ...@@ -127,7 +127,6 @@ erp5_mysql_innodb/z_related_translated_validation_state_title
erp5_mysql_innodb/z_related_uid erp5_mysql_innodb/z_related_uid
erp5_mysql_innodb/z_related_uid_or_parent_uid erp5_mysql_innodb/z_related_uid_or_parent_uid
erp5_mysql_innodb/z_reserve_uid erp5_mysql_innodb/z_reserve_uid
erp5_mysql_innodb/z_search_folder
erp5_mysql_innodb/z_search_results erp5_mysql_innodb/z_search_results
erp5_mysql_innodb/z_search_security erp5_mysql_innodb/z_search_security
erp5_mysql_innodb/z_show_category_columns erp5_mysql_innodb/z_show_category_columns
......
product/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_search_folder.xml deleted 100644 → 0
View file @ 8f877973
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<tuple>
<string>Products.ZSQLMethods.SQL</string>
<string>SQL</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>__ac_local_roles__</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>_arg</string> </key>
<value>
<object>
<klass>
<global name="Args" module="Shared.DC.ZRDB.Aqueduct"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_data</string> </key>
<value>
<dictionary>
<item>
<key> <string>parent_uid</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>query</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>sort_on</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>_keys</string> </key>
<value>
<list>
<string>sort_on</string>
<string>query</string>
<string>parent_uid</string>
</list>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>arguments_src</string> </key>
<value> <string>sort_on\r\n
query\r\n
parent_uid</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
<value> <int>10</int> </value>
</item>
<item>
<key> <string>class_file_</string> </key>
<value> <string>ZSQLCatalog.zsqlbrain</string> </value>
</item>
<item>
<key> <string>class_name_</string> </key>
<value> <string>ZSQLBrain</string> </value>
</item>
<item>
<key> <string>connection_hook</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>connection_id</string> </key>
<value> <string>erp5_sql_connection</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>z_search_folder</string> </value>
</item>
<item>
<key> <string>max_cache_</string> </key>
<value> <int>100</int> </value>
</item>
<item>
<key> <string>max_rows_</string> </key>
<value> <int>1000</int> </value>
</item>
<item>
<key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[
<dtml-if sort_on>\n
<dtml-if query>\n
SELECT DISTINCT catalog.* FROM catalog, category, roles_and_users WHERE catalog.uid=category.uid AND catalog.uid=roles_and_users.uid AND <dtml-var query> AND <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> ORDER BY <dtml-var sort_on>\n
<dtml-else>\n
SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> ORDER BY <dtml-var sort_on>\n
</dtml-if>\n
<dtml-else>\n
<dtml-if query>\n
SELECT DISTINCT catalog.* FROM catalog, category, roles_and_users WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> AND catalog.uid=category.uid AND catalog.uid=roles_and_users.uid AND <dtml-var query>\n
<dtml-else>\n
SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int>\n
</dtml-if>\n
</dtml-if>
]]></string> </value>
</item>
<item>
<key> <string>template</string> </key>
<value>
<object>
<klass>
<global name="SQL" module="Shared.DC.ZRDB.DA"/>
</klass>
<none/>
<state>
<dictionary>
<item>
<key> <string>__name__</string> </key>
<value> <string encoding="cdata"><![CDATA[
<string>
]]></string> </value>
</item>
<item>
<key> <string>_vars</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>globals</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[
<dtml-if sort_on>\n
<dtml-if query>\n
SELECT DISTINCT catalog.* FROM catalog, category, roles_and_users WHERE catalog.uid=category.uid AND catalog.uid=roles_and_users.uid AND <dtml-var query> AND <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> ORDER BY <dtml-var sort_on>\n
<dtml-else>\n
SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> ORDER BY <dtml-var sort_on>\n
</dtml-if>\n
<dtml-else>\n
<dtml-if query>\n
SELECT DISTINCT catalog.* FROM catalog, category, roles_and_users WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int> AND catalog.uid=category.uid AND catalog.uid=roles_and_users.uid AND <dtml-var query>\n
<dtml-else>\n
SELECT * FROM catalog WHERE <dtml-sqltest parent_uid op=eq column=catalog.parent_uid type=int>\n
</dtml-if>\n
</dtml-if>
]]></string> </value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_mysql_ndb_catalog/bt/template_catalog_method_id_list
View file @ 421302e3
...@@ -96,7 +96,6 @@ erp5_mysql_ndb/z_related_translated_validation_state_title ...@@ -96,7 +96,6 @@ erp5_mysql_ndb/z_related_translated_validation_state_title
erp5_mysql_ndb/z_related_uid erp5_mysql_ndb/z_related_uid
erp5_mysql_ndb/z_related_uid_or_parent_uid erp5_mysql_ndb/z_related_uid_or_parent_uid
erp5_mysql_ndb/z_reserve_uid erp5_mysql_ndb/z_reserve_uid
erp5_mysql_ndb/z_search_folder
erp5_mysql_ndb/z_search_results erp5_mysql_ndb/z_search_results
erp5_mysql_ndb/z_show_category_columns erp5_mysql_ndb/z_show_category_columns
erp5_mysql_ndb/z_show_columns erp5_mysql_ndb/z_show_columns
......
product/ERP5Type/Core/Folder.py
View file @ 421302e3
...@@ -525,9 +525,7 @@ class Folder(CopyContainer, CMFBTreeFolder, CMFHBTreeFolder, Base, FolderMixIn): ...@@ -525,9 +525,7 @@ class Folder(CopyContainer, CMFBTreeFolder, CMFHBTreeFolder, Base, FolderMixIn):
a new document in a folder. a new document in a folder.
ERP5 folders use the ZSQLCatalog to search for objects ERP5 folders use the ZSQLCatalog to search for objects
or display content. This requires a method called or display content.
*z_search_folder* to be put inside the ZSQLCatalog object
of the ERP5 portal.
An ERP5 Binder document class will eventually be defined An ERP5 Binder document class will eventually be defined
in order to implement a binder of documents which can itself in order to implement a binder of documents which can itself
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7