[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ Upgrade step for actions added and tested!

[Charlie Clark]

Log message for revision 117195:
  Upgrade step for actions added and tested!

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/actions.xml
  U   Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml
  U   Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/actions.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/actions.xml	2010-10-03 11:27:55 UTC (rev 117194)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/default/actions.xml	2010-10-03 11:47:31 UTC (rev 117195)
@@ -32,6 +32,21 @@
    </property>
    <property name="visible">True</property>
   </object>
+  <object insert-after="join" name="change_password" meta_type="CMF Action"
+     i18n:domain="cmf_default">
+   <property name="title" i18n:translate="">Change password</property>
+   <property name="description"
+      i18n:translate="">Change your password</property>
+   <property name="url_expr">string:${portal_url}/password_form</property>
+   <property name="link_target"></property>
+   <property
+      name="icon_expr">string:${portal_url}/preferences_icon.png</property>
+   <property name="available_expr">member</property>
+   <property name="permissions">
+    <element value="Set own password"/>
+   </property>
+   <property name="visible">True</property>
+  </object>
   <object name="preferences" meta_type="CMF Action" i18n:domain="cmf_default">
    <property name="title" i18n:translate="">Preferences</property>
    <property name="description"
@@ -134,6 +149,19 @@
    </property>
    <property name="visible">True</property>
   </object>
+  <object name="syndication" meta_type="CMF Action" i18n:domain="cmf_default">
+   <property name="title" i18n:translate="">Syndication</property>
+   <property name="description" i18n:translate=""></property>
+   <property name="url_expr">string:${folder_url}/synPropertiesForm</property>
+   <property name="link_target"></property>
+   <property
+      name="icon_expr">string:${portal_url}/syndication_icon.png</property>
+   <property name="available_expr">python: folder is object</property>
+   <property name="permissions">
+    <element value="Manage properties"/>
+   </property>
+   <property name="visible">True</property>
+  </object>
   <object name="interfaces" meta_type="CMF Action" i18n:domain="cmf_default">
    <property name="title" i18n:translate="">Interfaces</property>
    <property name="description"
@@ -164,19 +192,6 @@
    </property>
    <property name="visible">True</property>
   </object>
-  <object name="syndication" meta_type="CMF Action" i18n:domain="cmf_default">
-   <property name="title" i18n:translate="">Syndication</property>
-   <property name="description" i18n:translate=""></property>
-   <property name="url_expr">string:${folder_url}/synPropertiesForm</property>
-   <property name="link_target"></property>
-   <property
-      name="icon_expr">string:${portal_url}/syndication_icon.png</property>
-   <property name="available_expr">python: folder is object</property>
-   <property name="permissions">
-    <element value="Manage properties"/>
-   </property>
-   <property name="visible">True</property>
-  </object>
  </object>
  <object name="global" meta_type="CMF Action Category">
   <property name="title"></property>

Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml	2010-10-03 11:27:55 UTC (rev 117194)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml	2010-10-03 11:47:31 UTC (rev 117195)
@@ -208,6 +208,13 @@
         checker=".to23.check_acl_users"
         />
 
+    <genericsetup:upgradeStep
+        title="Upgrade acl_users"
+        description="Update UserFolder class."
+        handler=".to23.upgrade_actions_tool"
+        checker=".to23.check_actions_tool"
+        />
+
   </genericsetup:upgradeSteps>
 
   <genericsetup:upgradeStep

Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py	2010-10-03 11:27:55 UTC (rev 117194)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py	2010-10-03 11:47:31 UTC (rev 117195)
@@ -27,28 +27,6 @@
 
 _MARKER = object()
 
-_ACTIONS_XML = """\
-<?xml version="1.0"?>
-<object name="portal_actions" meta_type="CMF Actions Tool"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
-   <object insert-after="join" name="change_password" meta_type="CMF Action"
-      i18n:domain="cmf_default">
-    <property name="title" i18n:translate="">Change password</property>
-    <property name="description"
-       i18n:translate="">Change your password</property>
-    <property name="url_expr">string:${portal_url}/password_form</property>
-    <property name="link_target"></property>
-    <property
-       name="icon_expr">string:${portal_url}/preferences_icon.png</property>
-    <property name="available_expr">member</property>
-    <property name="permissions">
-     <element value="Set own password"/>
-    </property>
-    <property name="visible">True</property>
-   </object>
-</object>
-"""
-
 def check_cookie_crumbler(tool):
     """2.2.x to 2.3.0 upgrade step checker
     """
@@ -144,5 +122,54 @@
     atool = getToolByName(tool, 'portal_actions')
     environ = SetupEnviron()
     environ._should_purge = False
-    getMultiAdapter((atool, environ), IBody).body = _ACTIONS_XML
-    logger.info("'change_password' action added.")
\ No newline at end of file
+    getMultiAdapter((atool, environ), IBody).body = _ACTIONS_PASSWORD_XML
+    logger.info("'change_password' action added.")
+    getMultiAdapter((atool, environ), IBody).body = _ACTIONS_SYNDICATION_XML
+    logger.info("'portal syndication settings' action added.")
+    
+
+_ACTIONS_PASSWORD_XML = """\
+<?xml version="1.0"?>
+<object name="portal_actions" meta_type="CMF Actions Tool"
+   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+   <object name="user" meta_type="CMF Action Category">
+   <object insert-after="join" name="change_password" meta_type="CMF Action"
+      i18n:domain="cmf_default">
+    <property name="title" i18n:translate="">Change password</property>
+    <property name="description"
+       i18n:translate="">Change your password</property>
+    <property name="url_expr">string:${portal_url}/password_form</property>
+    <property name="link_target"></property>
+    <property
+       name="icon_expr">string:${portal_url}/preferences_icon.png</property>
+    <property name="available_expr">member</property>
+    <property name="permissions">
+     <element value="Set own password"/>
+    </property>
+    <property name="visible">True</property>
+   </object>
+   </object>
+</object>
+"""
+
+_ACTIONS_SYNDICATION_XML = """
+<object name="portal_actions" meta_type="CMF Actions Tool"
+   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+   <object name="global" meta_type="CMF Action Category">
+<object name="syndication" meta_type="CMF Action" i18n:domain="cmf_default">
+     <property name="title" i18n:translate="">Site Syndication</property>
+     <property name="description"
+        i18n:translate="">Enable or  disable syndication</property>
+     <property
+        name="url_expr">string:${portal_url}/@@syndication.html</property>
+     <property name="link_target"></property>
+     <property name="icon_expr">string:${portal_url}/tool_icon.png</property>
+     <property name="available_expr"></property>
+     <property name="permissions">
+      <element value="Manage portal"/>
+     </property>
+     <property name="visible">True</property>
+</object>
+</object>
+</object>
+"""
\ No newline at end of file