Skip to content

erp5
erp5
Commit a0904ada authored by Fabien Morin's avatar Fabien Morin
Browse files
Options

remove condition because it's already tested in the filter 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@21692 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent ec4a20c6
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 68 deletions
bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml
View file @ a0904ada
...@@ -35,24 +35,12 @@ ...@@ -35,24 +35,12 @@
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>getPortalType</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>getVatCode</string> </key> <key> <string>getVatCode</string> </key>
<value> <value>
<dictionary/> <dictionary/>
</value> </value>
</item> </item>
<item>
<key> <string>isPortalContent</string> </key>
<value>
<dictionary/>
</value>
</item>
<item> <item>
<key> <string>uid</string> </key> <key> <string>uid</string> </key>
<value> <value>
...@@ -66,8 +54,6 @@ ...@@ -66,8 +54,6 @@
<key> <string>_keys</string> </key> <key> <string>_keys</string> </key>
<value> <value>
<list> <list>
<string>isPortalContent</string>
<string>getPortalType</string>
<string>uid</string> <string>uid</string>
<string>getCorporateRegistrationCode</string> <string>getCorporateRegistrationCode</string>
<string>getVatCode</string> <string>getVatCode</string>
...@@ -87,9 +73,7 @@ ...@@ -87,9 +73,7 @@
</item> </item>
<item> <item>
<key> <string>arguments_src</string> </key> <key> <string>arguments_src</string> </key>
<value> <string>isPortalContent\r\n <value> <string>uid\r\n
getPortalType\r\n
uid\r\n
getCorporateRegistrationCode\r\n getCorporateRegistrationCode\r\n
getVatCode\r\n getVatCode\r\n
</string> </value> </string> </value>
...@@ -132,40 +116,19 @@ getVatCode\r\n ...@@ -132,40 +116,19 @@ getVatCode\r\n
<key> <string>src</string> </key> <key> <string>src</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<dtml-let egov_list="[]">\n <dtml-if expr="_.len(_.range(_.len(uid))) > 0">\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
<dtml-if "isPortalContent[loop_item] and getPortalType[loop_item] in (\'M0\',\n
\'M0 Bis\', \n
\'M2\', \n
\'M2 Bis\', \n
\'M4\', \n
\'P0\', \n
\'P2\', \n
\'P4\', \n
\'S1\', \n
\'S5\', \n
\'Subscription Form\', \n
\'Declaration TVA\',\n
\'Mandate Form\', \n
\'Assignment\',\n
\'Organisation\')">\n
<dtml-call expr="egov_list.append(loop_item)">\n
</dtml-if>\n
</dtml-in>\n
<dtml-if expr="_.len(egov_list) > 0">\n
REPLACE INTO\n REPLACE INTO\n
egov\n egov\n
VALUES\n VALUES\n
<dtml-in prefix="loop" expr="egov_list">\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
( \n ( \n
<dtml-sqlvar expr="uid[loop_item]" type="int">,\n <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
<dtml-sqlvar expr="getCorporateRegistrationCode[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="getCorporateRegistrationCode[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getVatCode[loop_item]" type="string" optional>\n <dtml-sqlvar expr="getVatCode[loop_item]" type="string" optional>\n
)\n )\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n <dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n </dtml-in>\n
</dtml-if>\n </dtml-if>\n
</dtml-let>\n
]]></string> </value> ]]></string> </value>
...@@ -206,40 +169,19 @@ VALUES\n ...@@ -206,40 +169,19 @@ VALUES\n
<key> <string>raw</string> </key> <key> <string>raw</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<dtml-let egov_list="[]">\n <dtml-if expr="_.len(_.range(_.len(uid))) > 0">\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
<dtml-if "isPortalContent[loop_item] and getPortalType[loop_item] in (\'M0\',\n
\'M0 Bis\', \n
\'M2\', \n
\'M2 Bis\', \n
\'M4\', \n
\'P0\', \n
\'P2\', \n
\'P4\', \n
\'S1\', \n
\'S5\', \n
\'Subscription Form\', \n
\'Declaration TVA\',\n
\'Mandate Form\', \n
\'Assignment\',\n
\'Organisation\')">\n
<dtml-call expr="egov_list.append(loop_item)">\n
</dtml-if>\n
</dtml-in>\n
<dtml-if expr="_.len(egov_list) > 0">\n
REPLACE INTO\n REPLACE INTO\n
egov\n egov\n
VALUES\n VALUES\n
<dtml-in prefix="loop" expr="egov_list">\n <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
( \n ( \n
<dtml-sqlvar expr="uid[loop_item]" type="int">,\n <dtml-sqlvar expr="uid[loop_item]" type="int">,\n
<dtml-sqlvar expr="getCorporateRegistrationCode[loop_item]" type="string" optional>,\n <dtml-sqlvar expr="getCorporateRegistrationCode[loop_item]" type="string" optional>,\n
<dtml-sqlvar expr="getVatCode[loop_item]" type="string" optional>\n <dtml-sqlvar expr="getVatCode[loop_item]" type="string" optional>\n
)\n )\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n <dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n </dtml-in>\n
</dtml-if>\n </dtml-if>\n
</dtml-let>\n
]]></string> </value> ]]></string> </value>
......
bt5/erp5_egov_mysql_innodb_catalog/bt/revision
View file @ a0904ada
2 16
\ No newline at end of file \ No newline at end of file
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