Commit 1b307307 authored by Vincent Pelletier's avatar Vincent Pelletier

erp5_mysql_innodb_catalog: Drop valid_from_table_list parameter.

It is not passed a value, so DTML walks acquisition path (and skins) on
each call (which do not pass from_expression).
parent db65e749
...@@ -20,7 +20,6 @@ where_expression\r\n ...@@ -20,7 +20,6 @@ where_expression\r\n
select_expression\r\n select_expression\r\n
group_by_expression\r\n group_by_expression\r\n
from_table_list:list\r\n from_table_list:list\r\n
valid_from_table_list:list\r\n
from_expression\r\n from_expression\r\n
limit_expression</string> </value> limit_expression</string> </value>
</item> </item>
...@@ -72,13 +71,9 @@ SELECT COUNT(DISTINCT(catalog.uid)) \n ...@@ -72,13 +71,9 @@ SELECT COUNT(DISTINCT(catalog.uid)) \n
FROM\n FROM\n
<dtml-if from_expression>\n <dtml-if from_expression>\n
<dtml-var from_expression>\n <dtml-var from_expression>\n
<dtml-else>\n
<dtml-if valid_from_table_list>\n
<dtml-in valid_from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
<dtml-else>\n <dtml-else>\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-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>\n </dtml-if>\n
</dtml-if>\n
<dtml-if selection_domain>\n <dtml-if selection_domain>\n
<dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain, 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-if expression> , <dtml-var expression> </dtml-if>\n
......
...@@ -20,7 +20,6 @@ where_expression\r\n ...@@ -20,7 +20,6 @@ where_expression\r\n
select_expression\r\n select_expression\r\n
group_by_expression\r\n group_by_expression\r\n
from_table_list:list\r\n from_table_list:list\r\n
valid_from_table_list:list\r\n
from_expression\r\n from_expression\r\n
sort_on\r\n sort_on\r\n
limit_expression\r\n limit_expression\r\n
...@@ -71,13 +70,9 @@ SELECT DISTINCT\n ...@@ -71,13 +70,9 @@ SELECT DISTINCT\n
FROM\n FROM\n
<dtml-if from_expression>\n <dtml-if from_expression>\n
<dtml-var from_expression>\n <dtml-var from_expression>\n
<dtml-else>\n
<dtml-if valid_from_table_list>\n
<dtml-in valid_from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>\n
<dtml-else>\n <dtml-else>\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-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>\n </dtml-if>\n
</dtml-if>\n
<dtml-if selection_domain>\n <dtml-if selection_domain>\n
<dtml-let expression="portal_selections.buildSQLJoinExpressionFromDomainSelection(selection_domain, 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-if expression> , <dtml-var expression> </dtml-if>\n
......
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