[Erp5-report] r29359 - /erp5/trunk/products/ERP5/Document/BusinessTemplate.py

[nobody at svn.erp5.org]

Author: romain
Date: Thu Oct  1 16:32:14 2009
New Revision: 29359

URL: http://svn.erp5.org?rev=29359&view=rev
Log:
Keep compatibility with previous export format of business_template_registered_skin_selections and do not modify exported value

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

Modified: erp5/trunk/products/ERP5/Document/BusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BusinessTemplate.py?rev=29359&r1=29358&r2=29359&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] Thu Oct  1 16:32:14 2009
@@ -967,13 +967,20 @@
             container.getParentValue().updateCache()
           elif (container.meta_type == 'CMF Skins Tool') and \
               (old_obj is not None):
-            # Keep previous value of register skin selection for skin folder
-            skin_selection_list = old_obj.getProperty(
-                'business_template_registered_skin_selections', None)
-            if skin_selection_list is not None:
-              obj._setProperty(
-                  'business_template_registered_skin_selections',
-                  skin_selection_list, type='tokens')
+            # Keep compatibility with previous export format of
+            # business_template_registered_skin_selections
+            # and do not modify exported value
+            if obj.getProperty('business_template_registered_skin_selections', 
+                               None) is None:
+              # Keep previous value of register skin selection for skin folder
+              skin_selection_list = old_obj.getProperty(
+                  'business_template_registered_skin_selections', None)
+              if skin_selection_list is not None:
+                if isinstance(skin_selection_list, basestring):
+                  skin_selection_list = skin_selection_list.split(' ')
+                obj._setProperty(
+                    'business_template_registered_skin_selections',
+                    skin_selection_list, type='tokens')
            
           recurse(restoreHook, obj)
       # now put original order group