ERP5Workflow: revert some changes

product/ERP5/__init__.py

@@ -52,7 +52,6 @@ from Tool import CategoryTool, SimulationTool, RuleTool, IdTool, TemplateTool,\
                  AcknowledgementTool, SolverTool, SolverProcessTool,\
                  ConversionTool, RoundingTool, UrlRegistryTool, InterfaceTool,\
                  CertificateAuthorityTool, InotifyTool, TaskDistributionTool
-
 import ERP5Site
 from Document import PythonScript
 object_classes = ( ERP5Site.ERP5Site,

product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/component_validation_workflow/transitions/validate_action.xml

@@ -10,10 +10,6 @@
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
         </item>
-        <item>
-            <key> <string>actbox_icon</string> </key>
-            <value> <string></string> </value>
-        </item>
         <item>
             <key> <string>actbox_name</string> </key>
             <value> <string>Validate</string> </value>

product/ERP5/bootstrap/erp5_core/WorkflowTemplateItem/portal_workflow/validation_workflow/states/draft.xml

@@ -46,12 +46,18 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <global name="PersistentMapping" module="Persistence.mapping"/>
+      <tuple>
+        <tuple>
+          <string>Persistence</string>
+          <string>PersistentMapping</string>
+        </tuple>
+        <none/>
+      </tuple>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>data</string> </key>
+            <key> <string>_container</string> </key>
             <value>
               <dictionary>
                 <item>

product/ERP5/bootstrap/erp5_core/bt/test_dependency_list

 erp5_full_text_mroonga_catalog
+erp5_base
\ No newline at end of file

product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/PythonScript/parameter_signature_property.xml

@@ -47,12 +47,6 @@
             <key> <string>portal_type</string> </key>
             <value> <string>Standard Property</string> </value>
         </item>
-        <item>
-            <key> <string>property_default</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>storage_id</string> </key>
             <value> <string>_params</string> </value>

product/ERP5/tests/testBase.py

@@ -215,7 +215,6 @@ class TestBase(ERP5TypeTestCase, ZopeTestCase.Functional):
       Check if there is no activity in activity queue.
     """
     portal = self.getPortal()
-    self.tic()
     message_list = portal.portal_activities.getMessageList()
     self.assertEqual(len(message_list), 0)
 

product/ERP5SyncML/tests/testERP5SyncML.py

@@ -444,14 +444,6 @@ class TestERP5SyncMLMixin(TestMixin):
       else:
         identity = False
         break
-    if 'edit_workflow' in object_sub.getTypeInfo().getTypeWorkflowList() and\
-        'edit_workflow' in object_pub.getTypeInfo().getTypeWorkflowList():
-      # edit workflow has a known bug, that may generate 2 times of history for
-      # a single action like "edit". Until we find out the bug, we may reactivate this
-      # part. In new workflow, on object_pub side it still generated 2 times of history
-      # for a sigle action "edit", but on the object_sub side, it only generated
-      # once, which it should have been.
-      identity = True
     if not identity:
       self.fail('diff between pub:%s and sub:%s \n%s' % (object_pub.getPath(),
                                                          object_sub.getPath(),

product/ERP5Type/Base.py

@@ -3,7 +3,6 @@
 #
 # Copyright (c) 2002-2003 Nexedi SARL and Contributors. All Rights Reserved.
 #                    Jean-Paul Smets-Solanes <jp@nexedi.com>
-#               2014 Wenjie Zheng <wenjie.zheng@tiolive.com>
 #
 # WARNING: This program as such is intended to be used by professional
 # programmers who take the whole responsability of assessing all potential
@@ -176,7 +175,6 @@ class WorkflowMethod(Method):
     valid_invoke_once_item_list = []
     # Only keep those transitions which were never invoked
     once_transition_dict = {}
-
     for wf_id, transition_list in invoke_once_dict.iteritems():
       valid_transition_list = []
       for transition_id in transition_list:
@@ -581,7 +579,6 @@ def initializePortalTypeDynamicWorkflowMethods(ptype_klass, portal_workflow):
   for wf_id, v in interaction_workflow_dict.iteritems():
     transition_id_set, trigger_dict = v
     for tr_id, tdef in trigger_dict.iteritems():
-
       # Check portal type filter
       if (tdef.portal_type_filter is not None and \
           portal_type not in tdef.portal_type_filter):