[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - added enable_actionicons property to default profile

[Yvo Schubbe]

Log message for revision 93325:
  - added enable_actionicons property to default profile
  - set missing site properties in upgrade steps

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/properties.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_control/portal_config_control.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/reconfig_form.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to21.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to22.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/properties.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/properties.xml	2008-11-24 17:42:25 UTC (rev 93324)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/properties.xml	2008-11-24 19:29:49 UTC (rev 93325)
@@ -10,4 +10,5 @@
  <property name="default_charset" type="string">utf-8</property>
  <property name="email_charset" type="string">iso-8859-1</property>
  <property name="enable_permalink" type="boolean">False</property>
+ <property name="enable_actionicons" type="boolean">False</property>
 </site>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_control/portal_config_control.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_control/portal_config_control.py	2008-11-24 17:42:25 UTC (rev 93324)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_control/portal_config_control.py	2008-11-24 19:29:49 UTC (rev 93325)
@@ -5,10 +5,6 @@
 
 ptool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
 
-if not ptool.hasProperty('default_charset'):
-    ptool.manage_addProperty('default_charset', '', 'string')
-if not ptool.hasProperty('email_charset'):
-    ptool.manage_addProperty('email_charset', '', 'string')
 if not ptool.hasProperty('enable_actionicons'):
     ptool.manage_addProperty('enable_actionicons', '', 'boolean')
 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/reconfig_form.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/reconfig_form.py	2008-11-24 17:42:25 UTC (rev 93324)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/reconfig_form.py	2008-11-24 19:29:49 UTC (rev 93325)
@@ -29,9 +29,8 @@
                     'title': ptool.title(),
                     'description': ptool.getProperty('description'),
                     'validate_email': ptool.getProperty('validate_email'),
-                    'default_charset':
-                                    ptool.getProperty('default_charset', ''),
-                    'email_charset': ptool.getProperty('email_charset', ''),
+                    'default_charset': ptool.getProperty('default_charset'),
+                    'email_charset': ptool.getProperty('email_charset'),
                     'enable_actionicons':
                                       ptool.getProperty('enable_actionicons'),
                     'listButtonInfos': tuple(buttons) }

Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to21.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to21.py	2008-11-24 17:42:25 UTC (rev 93324)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to21.py	2008-11-24 19:29:49 UTC (rev 93325)
@@ -83,3 +83,14 @@
     if not tuple(components.registeredUtilities()):
         getMultiAdapter((components, SetupEnviron()), IBody).body = _XML
         logger.info('Utility registrations added.')
+
+    if not portal.hasProperty('email_charset'):
+        portal.manage_addProperty('email_charset', 'iso-8859-1', 'string')
+        prop_map = list(portal._properties)
+        for i in range(len(prop_map)):
+            if prop_map[i]['id'] == 'default_charset':
+                email_charset_info = prop_map.pop(-1)
+                prop_map.insert(i+1, email_charset_info)
+                portal._properties = tuple(prop_map)
+                break
+        logger.info("'email_charset' property added.")

Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to22.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to22.py	2008-11-24 17:42:25 UTC (rev 93324)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to22.py	2008-11-24 19:29:49 UTC (rev 93325)
@@ -34,6 +34,10 @@
         components.__name__ = '++etc++site'
         logger.info('Site manager name changed.')
 
+    if not portal.hasProperty('enable_actionicons'):
+        portal.manage_addProperty('enable_actionicons', False, 'boolean')
+        logger.info("'enable_actionicons' property added.")
+
 def upgrade_TypeInfos(portal, logger):
     ttool = portal.portal_types
     for ti in ttool.listTypeInfo():