[Erp5-report] r36553 mayoro - in /erp5/trunk/bt5/erp5_egov: CatalogMethodTemplateItem/porta...

[nobody at svn.erp5.org]

Author: mayoro
Date: Wed Jun 23 18:33:46 2010
New Revision: 36553

URL: http://svn.erp5.org?rev=36553&view=rev
Log:
2010-06-23 mayoro
* Change filter expression in z_catalog_egov_list
* Allow Agent and Owner to delete procedure in draft state

Modified:
    erp5/trunk/bt5/erp5_egov/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.catalog_keys.xml
    erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_universal_workflow/states/draft.xml
    erp5/trunk/bt5/erp5_egov/bt/change_log
    erp5/trunk/bt5/erp5_egov/bt/revision

Modified: erp5/trunk/bt5/erp5_egov/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.catalog_keys.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.catalog_keys.xml?rev=36553&r1=36552&r2=36553&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.catalog_keys.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_egov_list.catalog_keys.xml [utf8] Wed Jun 23 18:33:46 2010
@@ -6,6 +6,6 @@
   <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  context.getTypeInfo().getPortalType() == 'EGov Type'</value>
  </item>
 </catalog_method>

Modified: erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_universal_workflow/states/draft.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_universal_workflow/states/draft.xml?rev=36553&r1=36552&r2=36553&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_universal_workflow/states/draft.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_universal_workflow/states/draft.xml [utf8] Wed Jun 23 18:33:46 2010
@@ -77,6 +77,7 @@
                     <value>
                       <tuple>
                         <string>Agent</string>
+                        <string>Manager</string>
                         <string>Owner</string>
                       </tuple>
                     </value>
@@ -84,7 +85,10 @@
                 <item>
                     <key> <string>Delete objects</string> </key>
                     <value>
-                      <tuple/>
+                      <tuple>
+                        <string>Agent</string>
+                        <string>Owner</string>
+                      </tuple>
                     </value>
                 </item>
                 <item>
@@ -99,7 +103,10 @@
                 <item>
                     <key> <string>Set own password</string> </key>
                     <value>
-                      <tuple/>
+                      <tuple>
+                        <string>Agent</string>
+                        <string>Owner</string>
+                      </tuple>
                     </value>
                 </item>
                 <item>

Modified: erp5/trunk/bt5/erp5_egov/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/change_log?rev=36553&r1=36552&r2=36553&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/change_log [utf8] Wed Jun 23 18:33:46 2010
@@ -1,4 +1,8 @@
 2010-06-23 mayoro
+* Change filter expression in z_catalog_egov_list
+* Allow Agent and Owner to delete procedure in draft state
+
+2010-06-23 mayoro
 * correct redirect url when logout
 * display login and password to track anonymous procedure at the end of submission (it's not only for Subscription Form)
 * remove log in EGov_Base_editAndNextStep

Modified: erp5/trunk/bt5/erp5_egov/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/revision?rev=36553&r1=36552&r2=36553&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/revision [utf8] Wed Jun 23 18:33:46 2010
@@ -1 +1 @@
-599
\ No newline at end of file
+602
\ No newline at end of file