fixed for new related view feature

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1944 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Catalog/sql/common_mysql/z_related_security.zsql

@@ -8,4 +8,4 @@ class_name:
 class_file:
 </dtml-comment>
 <params>table_0</params>
-<dtml-var table_0>.uid = catalog.uid
\ No newline at end of file
+<dtml-var table_0>.uid = catalog.security_uid
\ No newline at end of file

product/ERP5Catalog/sql/erp5_mysql/z_count_results.zsql

@@ -18,13 +18,11 @@ SELECT
   , <dtml-var select_expression>
 </dtml-if>
 FROM
-  <dtml-var "','.join(from_table_list)">
+  <dtml-in from_table_list> <dtml-var sequence-item> AS <dtml-var sequence-key><dtml-if sequence-end><dtml-else>,</dtml-if></dtml-in>
   <dtml-if selection_domain>, <dtml-var "selection_domain.asSqlJoinExpression()"> </dtml-if>
   <dtml-if selection_report>, <dtml-var "selection_report.asSqlJoinExpression()"> </dtml-if>
 WHERE
   1 = 1
-  <dtml-comment>We make sure here that no roles_and_users is not used</dtml-comment>
-<dtml-in from_table_list><dtml-if "_['sequence-item']=='roles_and_users'"><dtml-if select_expression><dtml-else> AND catalog.security_uid = <dtml-var sequence-item>.uid</dtml-if> <dtml-else> AND catalog.uid = <dtml-var sequence-item>.uid </dtml-if> </dtml-in>
 <dtml-if where_expression>
   AND <dtml-var where_expression>
 </dtml-if>