[Erp5-report] r13092 - in /erp5/trunk/products: CMFCategory/ ERP5/bootstrap/erp5_core/SkinT...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Feb 28 08:58:11 CET 2007
Author: kazuhiko
Date: Wed Feb 28 08:57:34 2007
New Revision: 13092
URL: http://svn.erp5.org?rev=13092&view=rev
Log:
* add SelectionTool.buildSQLJoinExpressionFromDomainSelection()
* add SelectionTool.buildSQLExpressionFromDomainSelection()
* please use these methods instead of selection_domain.asSQLJoinExpression
and selection_domain.asSQLExpression.
* to pass a DomainSelection instance to these methods is
deprecated. please use a domain dict instance to these methods
instead.
Modified:
erp5/trunk/products/CMFCategory/CategoryTool.py
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_count_results.xml
erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_search_results.xml
erp5/trunk/products/ERP5Form/SelectionTool.py
Modified: erp5/trunk/products/CMFCategory/CategoryTool.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFCategory/CategoryTool.py?rev=13092&r1=13091&r2=13092&view=diff
==============================================================================
--- erp5/trunk/products/CMFCategory/CategoryTool.py (original)
+++ erp5/trunk/products/CMFCategory/CategoryTool.py Wed Feb 28 08:57:34 2007
@@ -1381,7 +1381,6 @@
"""
This returns a catalog_search resource with can then be used by getCategoryMemberItemList
"""
- from Products.ERP5Form.Selection import DomainSelection
if base_category is None:
if context.getPortalType() in ( "Base Category", "Category") :
base_category = context.getBaseCategoryId()
@@ -1390,13 +1389,12 @@
strict_membership = kw.get('strict_membership', kw.get('strict', 0))
domain_dict = {base_category: ('portal_categories', context.getRelativeUrl())}
- selection_domain = DomainSelection(domain_dict = domain_dict).__of__(context)
if strict_membership:
catalog_search = self.portal_catalog(portal_type = portal_type,
- selection_report = selection_domain)
+ selection_report = domain_dict)
else:
catalog_search = self.portal_catalog(portal_type = portal_type,
- selection_domain = selection_domain)
+ selection_domain = domain_dict)
return catalog_search
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml?rev=13092&r1=13091&r2=13092&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventory.xml Wed Feb 28 08:57:34 2007
@@ -260,9 +260,9 @@
</dtml-if>\n
</dtml-in>\n
<dtml-if selection_domain>,\n
- <dtml-var "selection_domain.asSQLJoinExpression()"> </dtml-if>\n
+ <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
<dtml-if selection_report>,\n
- <dtml-var "selection_report.asSQLJoinExpression()"> </dtml-if>\n
+ <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
, catalog as node, catalog as resource\n
\n
WHERE\n
@@ -313,11 +313,10 @@
</dtml-if>\n
\n
<dtml-if selection_domain>\n
- AND <dtml-var "selection_domain.asSQLExpression(join_table=\'stock\',\n
- join_column=\'node_uid\')">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, join_table=\'stock\', join_column=\'node_uid\')">\n
</dtml-if>\n
<dtml-if selection_report>\n
- AND <dtml-var "selection_report.asSQLExpression(strict_membership=1)">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n
</dtml-if>\n
\n
<dtml-if group_by_expression>\n
@@ -397,9 +396,9 @@
</dtml-if>\n
</dtml-in>\n
<dtml-if selection_domain>,\n
- <dtml-var "selection_domain.asSQLJoinExpression()"> </dtml-if>\n
+ <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
<dtml-if selection_report>,\n
- <dtml-var "selection_report.asSQLJoinExpression()"> </dtml-if>\n
+ <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
, catalog as node, catalog as resource\n
\n
WHERE\n
@@ -450,11 +449,10 @@
</dtml-if>\n
\n
<dtml-if selection_domain>\n
- AND <dtml-var "selection_domain.asSQLExpression(join_table=\'stock\',\n
- join_column=\'node_uid\')">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, join_table=\'stock\', join_column=\'node_uid\')">\n
</dtml-if>\n
<dtml-if selection_report>\n
- AND <dtml-var "selection_report.asSQLExpression(strict_membership=1)">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n
</dtml-if>\n
\n
<dtml-if group_by_expression>\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml?rev=13092&r1=13091&r2=13092&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetInventoryList.xml Wed Feb 28 08:57:34 2007
@@ -257,8 +257,8 @@
, <dtml-var table_item> AS <dtml-var table_key>\n
</dtml-if>\n
</dtml-in>\n
- <dtml-if selection_domain>, <dtml-var "selection_domain.asSQLJoinExpression()"> </dtml-if>\n
- <dtml-if selection_report>, <dtml-var "selection_report.asSQLJoinExpression()"> </dtml-if>\n
+ <dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
+ <dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
, catalog as node, catalog as resource\n
\n
WHERE\n
@@ -314,11 +314,10 @@
</dtml-if>\n
\n
<dtml-if selection_domain>\n
- AND <dtml-var "selection_domain.asSQLExpression(join_table=\'stock\',\n
- join_column=\'node_uid\')">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, join_table=\'stock\', join_column=\'node_uid\')">\n
</dtml-if>\n
<dtml-if selection_report>\n
- AND <dtml-var "selection_report.asSQLExpression(strict_membership=1)">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n
</dtml-if>\n
GROUP BY\n
<dtml-if group_by_expression>\n
@@ -398,8 +397,8 @@
, <dtml-var table_item> AS <dtml-var table_key>\n
</dtml-if>\n
</dtml-in>\n
- <dtml-if selection_domain>, <dtml-var "selection_domain.asSQLJoinExpression()"> </dtml-if>\n
- <dtml-if selection_report>, <dtml-var "selection_report.asSQLJoinExpression()"> </dtml-if>\n
+ <dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
+ <dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
, catalog as node, catalog as resource\n
\n
WHERE\n
@@ -455,11 +454,10 @@
</dtml-if>\n
\n
<dtml-if selection_domain>\n
- AND <dtml-var "selection_domain.asSQLExpression(join_table=\'stock\',\n
- join_column=\'node_uid\')">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, join_table=\'stock\', join_column=\'node_uid\')">\n
</dtml-if>\n
<dtml-if selection_report>\n
- AND <dtml-var "selection_report.asSQLExpression(strict_membership=1)">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n
</dtml-if>\n
GROUP BY\n
<dtml-if group_by_expression>\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml?rev=13092&r1=13091&r2=13092&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetMovementHistoryList.xml Wed Feb 28 08:57:34 2007
@@ -695,8 +695,8 @@
, <dtml-var table_item> AS <dtml-var table_key>\n
</dtml-if>\n
</dtml-in>\n
- <dtml-if selection_domain>, <dtml-var "selection_domain.asSQLJoinExpression()"> </dtml-if>\n
- <dtml-if selection_report>, <dtml-var "selection_report.asSQLJoinExpression()"> </dtml-if>\n
+ <dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
+ <dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
, catalog as node, catalog as resource\n
\n
WHERE\n
@@ -752,11 +752,10 @@
</dtml-if>\n
\n
<dtml-if selection_domain>\n
- AND <dtml-var "selection_domain.asSQLExpression(join_table=\'stock\',\n
- join_column=\'node_uid\')">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, join_table=\'stock\', join_column=\'node_uid\')">\n
</dtml-if>\n
<dtml-if selection_report>\n
- AND <dtml-var "selection_report.asSQLExpression(strict_membership=1)">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n
</dtml-if>\n
\n
GROUP BY\n
@@ -852,8 +851,8 @@
, <dtml-var table_item> AS <dtml-var table_key>\n
</dtml-if>\n
</dtml-in>\n
- <dtml-if selection_domain>, <dtml-var "selection_domain.asSQLJoinExpression()"> </dtml-if>\n
- <dtml-if selection_report>, <dtml-var "selection_report.asSQLJoinExpression()"> </dtml-if>\n
+ <dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
+ <dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
, catalog as node, catalog as resource\n
\n
WHERE\n
@@ -909,11 +908,10 @@
</dtml-if>\n
\n
<dtml-if selection_domain>\n
- AND <dtml-var "selection_domain.asSQLExpression(join_table=\'stock\',\n
- join_column=\'node_uid\')">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, join_table=\'stock\', join_column=\'node_uid\')">\n
</dtml-if>\n
<dtml-if selection_report>\n
- AND <dtml-var "selection_report.asSQLExpression(strict_membership=1)">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n
</dtml-if>\n
\n
GROUP BY\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml?rev=13092&r1=13091&r2=13092&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zGetTrackingList.xml Wed Feb 28 08:57:34 2007
@@ -407,8 +407,8 @@
<dtml-if expr="table_key != \'item\'">, <dtml-var table_item> AS <dtml-var table_key></dtml-if>\n
</dtml-in>\n
</dtml-if>\n
-<dtml-if selection_domain>, <dtml-var "selection_domain.asSQLJoinExpression()"> </dtml-if>\n
-<dtml-if selection_report>, <dtml-var "selection_report.asSQLJoinExpression()"> </dtml-if>\n
+<dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
+<dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
, item\n
\n
\n
@@ -456,11 +456,10 @@
\n
\n
<dtml-if selection_domain>\n
- AND <dtml-var "selection_domain.asSQLExpression(join_table=\'item\',\n
- join_column=\'node_uid\')">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, join_table=\'item\', join_column=\'node_uid\')">\n
</dtml-if>\n
<dtml-if selection_report>\n
- AND <dtml-var "selection_report.asSQLExpression(strict_membership=1)">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n
</dtml-if>\n
\n
<dtml-if group_by_expression>\n
@@ -526,8 +525,8 @@
<dtml-if expr="table_key != \'item\'">, <dtml-var table_item> AS <dtml-var table_key></dtml-if>\n
</dtml-in>\n
</dtml-if>\n
-<dtml-if selection_domain>, <dtml-var "selection_domain.asSQLJoinExpression()"> </dtml-if>\n
-<dtml-if selection_report>, <dtml-var "selection_report.asSQLJoinExpression()"> </dtml-if>\n
+<dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
+<dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
, item\n
\n
\n
@@ -575,11 +574,10 @@
\n
\n
<dtml-if selection_domain>\n
- AND <dtml-var "selection_domain.asSQLExpression(join_table=\'item\',\n
- join_column=\'node_uid\')">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, join_table=\'item\', join_column=\'node_uid\')">\n
</dtml-if>\n
<dtml-if selection_report>\n
- AND <dtml-var "selection_report.asSQLExpression(strict_membership=1)">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n
</dtml-if>\n
\n
<dtml-if group_by_expression>\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml?rev=13092&r1=13091&r2=13092&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Resource_zStatInventory.xml Wed Feb 28 08:57:34 2007
@@ -271,8 +271,8 @@
, <dtml-var sequence-item> AS <dtml-var sequence-key>\n
</dtml-in>\n
</dtml-if>\n
- <dtml-if selection_domain>, <dtml-var "selection_domain.asSQLJoinExpression()"> </dtml-if>\n
- <dtml-if selection_report>, <dtml-var "selection_report.asSQLJoinExpression()"> </dtml-if>\n
+ <dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
+ <dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
\n
WHERE\n
child.uid = stock.uid\n
@@ -337,10 +337,10 @@
</dtml-if>\n
\n
<dtml-if selection_domain>\n
- AND <dtml-var "selection_domain.asSQLExpression()">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain)">\n
</dtml-if>\n
<dtml-if selection_report>\n
- AND <dtml-var "selection_report.asSQLExpression()">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report)">\n
</dtml-if>\n
<dtml-if selection_uids>\n
AND\n
@@ -414,8 +414,8 @@
, <dtml-var sequence-item> AS <dtml-var sequence-key>\n
</dtml-in>\n
</dtml-if>\n
- <dtml-if selection_domain>, <dtml-var "selection_domain.asSQLJoinExpression()"> </dtml-if>\n
- <dtml-if selection_report>, <dtml-var "selection_report.asSQLJoinExpression()"> </dtml-if>\n
+ <dtml-if selection_domain>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)"> </dtml-if>\n
+ <dtml-if selection_report>, <dtml-var "portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)"> </dtml-if>\n
\n
WHERE\n
child.uid = stock.uid\n
@@ -480,10 +480,10 @@
</dtml-if>\n
\n
<dtml-if selection_domain>\n
- AND <dtml-var "selection_domain.asSQLExpression()">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_domain)">\n
</dtml-if>\n
<dtml-if selection_report>\n
- AND <dtml-var "selection_report.asSQLExpression()">\n
+ AND <dtml-var "portal_selections.buildSQLExpressionFromDomainSelection(selection_report)">\n
</dtml-if>\n
<dtml-if selection_uids>\n
AND\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml?rev=13092&r1=13091&r2=13092&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_count_results.xml Wed Feb 28 08:57:34 2007
@@ -150,12 +150,12 @@
FROM\n
<dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
<dtml-if selection_domain>\n
- <dtml-let expression="selection_domain.asSQLJoinExpression(category_table_alias = \'domain_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
<dtml-if selection_report>\n
- <dtml-let expression="selection_report.asSQLJoinExpression(category_table_alias = \'report_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report, category_table_alias = \'report_category\')">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
@@ -165,12 +165,12 @@
AND <dtml-var where_expression>\n
</dtml-if>\n
<dtml-if selection_domain>\n
- <dtml-let expression="selection_domain.asSQLExpression(category_table_alias = \'domain_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
<dtml-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
<dtml-if selection_report>\n
- <dtml-let expression="selection_report.asSQLExpression(strict_membership=1, category_table_alias = \'report_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1, category_table_alias = \'report_category\')">\n
<dtml-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
@@ -228,12 +228,12 @@
FROM\n
<dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
<dtml-if selection_domain>\n
- <dtml-let expression="selection_domain.asSQLJoinExpression(category_table_alias = \'domain_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
<dtml-if selection_report>\n
- <dtml-let expression="selection_report.asSQLJoinExpression(category_table_alias = \'report_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report, category_table_alias = \'report_category\')">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
@@ -243,12 +243,12 @@
AND <dtml-var where_expression>\n
</dtml-if>\n
<dtml-if selection_domain>\n
- <dtml-let expression="selection_domain.asSQLExpression(category_table_alias = \'domain_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
<dtml-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
<dtml-if selection_report>\n
- <dtml-let expression="selection_report.asSQLExpression(strict_membership=1, category_table_alias = \'report_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1, category_table_alias = \'report_category\')">\n
<dtml-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml?rev=13092&r1=13091&r2=13092&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_search_results.xml Wed Feb 28 08:57:34 2007
@@ -186,12 +186,12 @@
FROM\n
<dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
<dtml-if selection_domain>\n
- <dtml-let expression="selection_domain.asSQLJoinExpression(category_table_alias = \'domain_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
<dtml-if selection_report>\n
- <dtml-let expression="selection_report.asSQLJoinExpression(category_table_alias = \'report_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report, category_table_alias = \'report_category\')">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
@@ -202,12 +202,12 @@
AND <dtml-var where_expression>\n
</dtml-if>\n
<dtml-if selection_domain>\n
- <dtml-let expression="selection_domain.asSQLExpression(category_table_alias = \'domain_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
<dtml-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
<dtml-if selection_report>\n
- <dtml-let expression="selection_report.asSQLExpression(strict_membership=1, category_table_alias = \'report_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1, category_table_alias = \'report_category\')">\n
<dtml-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
@@ -267,12 +267,12 @@
FROM\n
<dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
<dtml-if selection_domain>\n
- <dtml-let expression="selection_domain.asSQLJoinExpression(category_table_alias = \'domain_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
<dtml-if selection_report>\n
- <dtml-let expression="selection_report.asSQLJoinExpression(category_table_alias = \'report_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report, category_table_alias = \'report_category\')">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
@@ -283,12 +283,12 @@
AND <dtml-var where_expression>\n
</dtml-if>\n
<dtml-if selection_domain>\n
- <dtml-let expression="selection_domain.asSQLExpression(category_table_alias = \'domain_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
<dtml-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
<dtml-if selection_report>\n
- <dtml-let expression="selection_report.asSQLExpression(strict_membership=1, category_table_alias = \'report_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1, category_table_alias = \'report_category\')">\n
<dtml-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_count_results.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_count_results.xml?rev=13092&r1=13091&r2=13092&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_count_results.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_count_results.xml Wed Feb 28 08:57:34 2007
@@ -142,12 +142,12 @@
FROM\n
<dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
<dtml-if selection_domain>\n
- <dtml-let expression="selection_domain.asSQLJoinExpression(category_table_alias = \'domain_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
<dtml-if selection_report>\n
- <dtml-let expression="selection_report.asSQLJoinExpression(category_table_alias = \'report_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report, category_table_alias = \'report_category\')">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
@@ -157,12 +157,12 @@
AND <dtml-var where_expression>\n
</dtml-if>\n
<dtml-if selection_domain>\n
- <dtml-let expression="selection_domain.asSQLExpression(category_table_alias = \'domain_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
<dtml-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
<dtml-if selection_report>\n
- <dtml-let expression="selection_report.asSQLExpression(strict_membership=1, category_table_alias = \'report_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1, category_table_alias = \'report_category\')">\n
<dtml-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
@@ -220,12 +220,12 @@
FROM\n
<dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
<dtml-if selection_domain>\n
- <dtml-let expression="selection_domain.asSQLJoinExpression()">\n
+ <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
<dtml-if selection_report>\n
- <dtml-let expression="selection_report.asSQLJoinExpression()">\n
+ <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
@@ -235,12 +235,12 @@
AND <dtml-var where_expression>\n
</dtml-if>\n
<dtml-if selection_domain>\n
- <dtml-let expression="selection_domain.asSQLExpression()">\n
+ <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_domain)">\n
<dtml-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
<dtml-if selection_report>\n
- <dtml-let expression="selection_report.asSQLExpression(strict_membership=1)">\n
+ <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n
<dtml-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_search_results.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_search_results.xml?rev=13092&r1=13091&r2=13092&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_search_results.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_mysql_ndb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_ndb/z_search_results.xml Wed Feb 28 08:57:34 2007
@@ -178,12 +178,12 @@
FROM\n
<dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
<dtml-if selection_domain>\n
- <dtml-let expression="selection_domain.asSQLJoinExpression(category_table_alias = \'domain_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
<dtml-if selection_report>\n
- <dtml-let expression="selection_report.asSQLJoinExpression(category_table_alias = \'report_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report, category_table_alias = \'report_category\')">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
@@ -194,12 +194,12 @@
AND <dtml-var where_expression>\n
</dtml-if>\n
<dtml-if selection_domain>\n
- <dtml-let expression="selection_domain.asSQLExpression(category_table_alias = \'domain_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_domain, category_table_alias = \'domain_category\')">\n
<dtml-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
<dtml-if selection_report>\n
- <dtml-let expression="selection_report.asSQLExpression(strict_membership=1, category_table_alias = \'report_category\')">\n
+ <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1, category_table_alias = \'report_category\')">\n
<dtml-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
@@ -259,12 +259,12 @@
FROM\n
<dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
<dtml-if selection_domain>\n
- <dtml-let expression="selection_domain.asSQLJoinExpression()">\n
+ <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain)">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
<dtml-if selection_report>\n
- <dtml-let expression="selection_report.asSQLJoinExpression()">\n
+ <dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_report)">\n
<dtml-if expression> , <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
@@ -275,12 +275,12 @@
AND <dtml-var where_expression>\n
</dtml-if>\n
<dtml-if selection_domain>\n
- <dtml-let expression="selection_domain.asSQLExpression()">\n
+ <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_domain)">\n
<dtml-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
<dtml-if selection_report>\n
- <dtml-let expression="selection_report.asSQLExpression(strict_membership=1)">\n
+ <dtml-let expression="portal_selections.buildSQLExpressionFromDomainSelection(selection_report, strict_membership=1)">\n
<dtml-if expression> AND <dtml-var expression> </dtml-if>\n
</dtml-let>\n
</dtml-if>\n
Modified: erp5/trunk/products/ERP5Form/SelectionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/SelectionTool.py?rev=13092&r1=13091&r2=13092&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/SelectionTool.py (original)
+++ erp5/trunk/products/ERP5Form/SelectionTool.py Wed Feb 28 08:57:34 2007
@@ -53,6 +53,7 @@
from zLOG import LOG
from Acquisition import Implicit, aq_base
from Products.ERP5Type.Message import Message
+import warnings
class SelectionError( Exception ):
pass
@@ -1156,6 +1157,37 @@
# Return the search dialog
return getattr(o, dialog_id)(REQUEST=REQUEST)
+ security.declarePublic('buildSQLJoinExpressionFromDomainSelection')
+ def buildSQLJoinExpressionFromDomainSelection(self, selection_domain,
+ domain_id=None,
+ exclude_domain_id=None,
+ category_table_alias='category'):
+ if isinstance(selection_domain, DomainSelection):
+ warnings.warn("To pass a DomainSelection instance is deprecated.\n"
+ "Please use a domain dict instead.",
+ DeprecationWarning)
+ else:
+ selection_domain = DomainSelection(selection_domain).__of__(self)
+ return selection_domain.asSQLJoinExpression(category_table_alias = category_table_alias)
+
+ security.declarePublic('buildSQLExpressionFromDomainSelection')
+ def buildSQLExpressionFromDomainSelection(self, selection_domain,
+ table_map=None, domain_id=None,
+ exclude_domain_id=None,
+ strict_membership=0,
+ join_table="catalog",
+ join_column="uid",
+ base_category=None,
+ category_table_alias='category'):
+ if isinstance(selection_domain, DomainSelection):
+ warnings.warn("To pass a DomainSelection instance is deprecated.\n"
+ "Please use a domain dict instead.",
+ DeprecationWarning)
+ else:
+ selection_domain = DomainSelection(selection_domain).__of__(self)
+ return selection_domain.asSQLExpression(strict_membership = strict_membership,
+ category_table_alias = category_table_alias)
+
def _aq_dynamic(self, name):
"""
Generate viewSearchRelatedDocumentDialog0,
More information about the Erp5-report
mailing list