[Erp5-report] r13874 - in /erp5/trunk/products/ERP5: Document/ tests/

[nobody at svn.erp5.org]

Author: aurel
Date: Tue Apr  3 09:56:32 2007
New Revision: 13874

URL: http://svn.erp5.org?rev=13874&view=rev
Log:
do no failed when upgrading portal type with empty action

Modified:
    erp5/trunk/products/ERP5/Document/BusinessTemplate.py
    erp5/trunk/products/ERP5/tests/testBusinessTemplate.py

Modified: erp5/trunk/products/ERP5/Document/BusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BusinessTemplate.py?rev=13874&r1=13873&r2=13874&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py Tue Apr  3 09:56:32 2007
@@ -682,9 +682,12 @@
             # set actions
             action_list = subobjects_dict['action_list']
             for action in action_list:
+              action_text = action.action
+              if isinstance(action_text, Expression):
+                action_text = action_text.text
               obj.addAction(id = action.id
                             , name = action.title
-                            , action = action.action.text
+                            , action = action_text
                             , condition = action.getCondition()
                             , permission = action.permissions
                             , category = action.category

Modified: erp5/trunk/products/ERP5/tests/testBusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testBusinessTemplate.py?rev=13874&r1=13873&r2=13874&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testBusinessTemplate.py (original)
+++ erp5/trunk/products/ERP5/tests/testBusinessTemplate.py Tue Apr  3 09:56:32 2007
@@ -980,6 +980,22 @@
       , visible = 1
       , priority = 2.0 )
     sequence.edit(first_action_id='become_geek')
+
+  def stepCreateEmptyAction(self, sequence=None, sequence_list=None, **kw):
+    """
+    Create an empty action
+    """
+    pt = self.getTypeTool()
+    object_id = sequence.get('object_ptype_id')
+    object_pt = pt._getOb(object_id)
+    object_pt.addAction(id = ''
+      , name = ' Nerd'
+      , action = ''
+      , condition = ''
+      , permission = ()
+      , category = ''
+      , visible = 1
+      , priority = 1.2)
 
   def stepCreateSecondAction(self, sequence=None, sequence_list=None, **kw):
     """
@@ -2551,6 +2567,54 @@
     sequence_list.addSequenceString(sequence_string)
     sequence_list.play(self, quiet=quiet)
 
+
+  def test_07_BusinessTemplateWithEmptyAction(self, quiet=quiet, run=run_all_test):
+    if not run: return
+    if not quiet:
+      message = 'Test Business Template Upgrade With Empty Action'
+      ZopeTestCase._print('\n%s ' % message)
+      LOG('Testing... ', 0, message)
+    sequence_list = SequenceList()
+    sequence_string = '\
+                       CreatePortalType \
+                       CreateFirstAction \
+                       CreateNewBusinessTemplate \
+                       UseExportBusinessTemplate \
+                       CheckModifiedBuildingState \
+                       CheckNotInstalledInstallationState \
+                       AddPortalTypeToBusinessTemplate \
+                       FillPortalTypesFields \
+                       BuildBusinessTemplate \
+                       CheckBuiltBuildingState \
+                       CheckNotInstalledInstallationState \
+                       CheckObjectPropertiesInBusinessTemplate \
+                       SaveBusinessTemplate \
+                       CheckBuiltBuildingState \
+                       CheckNotInstalledInstallationState \
+                       RemoveBusinessTemplate \
+                       RemoveAllTrashBins \
+                       CreateEmptyAction \
+                       ImportBusinessTemplate \
+                       UseImportBusinessTemplate \
+                       CheckBuiltBuildingState \
+                       CheckNotInstalledInstallationState \
+                       InstallBusinessTemplate \
+                       Tic \
+                       CheckInstalledInstallationState \
+                       CheckBuiltBuildingState \
+                       CheckSkinsLayers \
+                       CheckPortalTypeExists \
+                       CheckFirstActionExists \
+                       UninstallBusinessTemplate \
+                       CheckBuiltBuildingState \
+                       CheckNotInstalledInstallationState \
+                       CheckPortalTypeRemoved \
+                       '
+    sequence_list.addSequenceString(sequence_string)
+    sequence_list.play(self, quiet=quiet)
+
+
+
   def test_08_BusinessTemplateWithTwoActions(self, quiet=quiet, run=run_all_test):
     if not run: return
     if not quiet: