[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py - added check for syndication
Yvo Schubbe
y.2010 at wcm-solutions.de
Mon Nov 29 04:31:29 EST 2010
Log message for revision 118635:
- added check for syndication
- synced indentation of xml snippets with profile xml
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py 2010-11-29 09:27:23 UTC (rev 118634)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to23.py 2010-11-29 09:31:29 UTC (rev 118635)
@@ -113,6 +113,10 @@
atool.user.change_password
except AttributeError:
return True
+ try:
+ atool.user.syndication
+ except AttributeError:
+ return True
return False
def upgrade_actions_tool(tool):
@@ -126,50 +130,49 @@
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 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 = """
+_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 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>
-</object>
-</object>
-"""
\ No newline at end of file
+"""
More information about the checkins
mailing list