[Erp5-report] r36614 mayoro - in /erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog: CatalogMet...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jun 25 20:35:21 CEST 2010
Author: mayoro
Date: Fri Jun 25 20:35:21 2010
New Revision: 36614
URL: http://svn.erp5.org?rev=36614&view=rev
Log:
2010-06-25 mayoro
* modify egov table to be generic for erp5_egov bt and catalog methods
* remove specific portal_type in filter expressions of z_catalog_egov_list
Added:
erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/template_local_role_list
erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/template_portal_type_role_list
erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/template_registered_skin_selection_list
Modified:
erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.catalog_keys.xml
erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml
erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.catalog_keys.xml
erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.xml
erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/change_log
erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/revision
Modified: erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.catalog_keys.xml?rev=36614&r1=36613&r2=36614&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.catalog_keys.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.catalog_keys.xml [utf8] Fri Jun 25 20:35:21 2010
@@ -6,8 +6,9 @@
<value>1</value>
</item>
<item key="_filter_expression_archive" type="str">
- <value>python: here.getPortalType() in ('M0','M0 Bis','M2','M2 Bis','M4','P0','P2','P4','S1','S5','Subscription Form','Declaration TVA','Mandate Form', 'Organisation', 'Assignment')</value>
+ <value>python: context.getPortalType() in ('Organisation', 'Assignment') or (lambda type_info: type_info is not None and type_info.getPortalType() == 'EGov Type')(context.getTypeInfo())</value>
</item>
- <item key="_filter_type_archive" type="tuple">
+ <item key="_filter_expression_cache_key_archive" type="tuple">
+ <value>portal_type</value>
</item>
-</catalog_method>
\ No newline at end of file
+</catalog_method>
Modified: erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml?rev=36614&r1=36613&r2=36614&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.xml [utf8] Fri Jun 25 20:35:21 2010
@@ -10,12 +10,6 @@
<pickle>
<dictionary>
<item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
<key> <string>_arg</string> </key>
<value>
<object>
@@ -30,13 +24,19 @@
<value>
<dictionary>
<item>
- <key> <string>getCorporateRegistrationCode</string> </key>
+ <key> <string>getPortalType</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
+ <item>
+ <key> <string>getTranslatedValidationStateTitle</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
- <key> <string>getVatCode</string> </key>
+ <key> <string>modification_date</string> </key>
<value>
<dictionary/>
</value>
@@ -54,9 +54,10 @@
<key> <string>_keys</string> </key>
<value>
<list>
-<string>uid</string>
-<string>getCorporateRegistrationCode</string>
-<string>getVatCode</string>
+ <string>uid</string>
+ <string>getPortalType</string>
+ <string>getTranslatedValidationStateTitle</string>
+ <string>modification_date</string>
</list>
</value>
</item>
@@ -66,6 +67,12 @@
</value>
</item>
<item>
+ <key> <string>_col</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
<key> <string>allow_simple_one_argument_traversal</string> </key>
<value>
<none/>
@@ -74,9 +81,9 @@
<item>
<key> <string>arguments_src</string> </key>
<value> <string>uid\r\n
-getCorporateRegistrationCode\r\n
-getVatCode\r\n
-</string> </value>
+getPortalType\r\n
+getTranslatedValidationStateTitle\r\n
+modification_date </string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -123,8 +130,9 @@ VALUES\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
( \n
<dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="getCorporateRegistrationCode[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getVatCode[loop_item]" type="string" optional>\n
+ <dtml-sqlvar expr="getPortalType[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getTranslatedValidationStateTitle[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="modification_date[loop_item]" type="datetime" optional>\n
)\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n
@@ -176,8 +184,9 @@ VALUES\n
<dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
( \n
<dtml-sqlvar expr="uid[loop_item]" type="int">,\n
- <dtml-sqlvar expr="getCorporateRegistrationCode[loop_item]" type="string" optional>,\n
- <dtml-sqlvar expr="getVatCode[loop_item]" type="string" optional>\n
+ <dtml-sqlvar expr="getPortalType[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="getTranslatedValidationStateTitle[loop_item]" type="string" optional>,\n
+ <dtml-sqlvar expr="modification_date[loop_item]" type="datetime" optional>\n
)\n
<dtml-if sequence-end><dtml-else>,</dtml-if>\n
</dtml-in>\n
Modified: erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.catalog_keys.xml?rev=36614&r1=36613&r2=36614&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.catalog_keys.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.catalog_keys.xml [utf8] Fri Jun 25 20:35:21 2010
@@ -2,4 +2,4 @@
<item key="sql_clear_catalog" type="int">
<value>1</value>
</item>
-</catalog_method>
\ No newline at end of file
+</catalog_method>
Modified: erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.xml?rev=36614&r1=36613&r2=36614&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_create_egov.xml [utf8] Fri Jun 25 20:35:21 2010
@@ -10,12 +10,6 @@
<pickle>
<dictionary>
<item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
<key> <string>_arg</string> </key>
<value>
<object>
@@ -96,11 +90,10 @@
<key> <string>src</string> </key>
<value> <string>CREATE TABLE `egov` (\n
`uid` BIGINT UNSIGNED NOT NULL,\n
- `corporate_registration_code` VARCHAR(255) DEFAULT \'\',\n
- `vat_code` VARCHAR(255) DEFAULT \'\',\n
- PRIMARY KEY (`uid`),\n
- KEY `rccm` (`corporate_registration_code`),\n
- KEY `ninea` (`vat_code`)\n
+ `portal_type` VARCHAR(255) DEFAULT \'\',\n
+ `translated_validation_state_title` VARCHAR(255) DEFAULT \'\',\n
+ `modification_date` DATETIME,\n
+ PRIMARY KEY (`uid`)\n
) TYPE=InnoDB\n
</string> </value>
</item>
@@ -140,11 +133,10 @@
<key> <string>raw</string> </key>
<value> <string>CREATE TABLE `egov` (\n
`uid` BIGINT UNSIGNED NOT NULL,\n
- `corporate_registration_code` VARCHAR(255) DEFAULT \'\',\n
- `vat_code` VARCHAR(255) DEFAULT \'\',\n
- PRIMARY KEY (`uid`),\n
- KEY `rccm` (`corporate_registration_code`),\n
- KEY `ninea` (`vat_code`)\n
+ `portal_type` VARCHAR(255) DEFAULT \'\',\n
+ `translated_validation_state_title` VARCHAR(255) DEFAULT \'\',\n
+ `modification_date` DATETIME,\n
+ PRIMARY KEY (`uid`)\n
) TYPE=InnoDB\n
</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/change_log?rev=36614&r1=36613&r2=36614&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/change_log [utf8] Fri Jun 25 20:35:21 2010
@@ -1,3 +1,7 @@
+2010-06-25 mayoro
+* modify egov table to be generic for erp5_egov bt and catalog methods
+* remove specific portal_type in filter expressions of z_catalog_egov_list
+
2008-07-01 fabien
* add birth_detail table to be able to catalog details relative to birth (place and date)
Modified: erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/revision?rev=36614&r1=36613&r2=36614&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/revision [utf8] Fri Jun 25 20:35:21 2010
@@ -1 +1 @@
-25
\ No newline at end of file
+29
\ No newline at end of file
Added: erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/template_local_role_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/template_local_role_list?rev=36614&view=auto
==============================================================================
(empty)
Added: erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/template_portal_type_role_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/template_portal_type_role_list?rev=36614&view=auto
==============================================================================
(empty)
Added: erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/template_registered_skin_selection_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov_mysql_innodb_catalog/bt/template_registered_skin_selection_list?rev=36614&view=auto
==============================================================================
(empty)
More information about the Erp5-report
mailing list