[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/ - removed 'link target' upgrade step (this was overkill)

[Yvo Schubbe]

Log message for revision 101912:
  - removed 'link target' upgrade step (this was overkill)

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml
  U   Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to22.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml	2009-07-14 17:05:07 UTC (rev 101911)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/configure.zcml	2009-07-14 17:08:28 UTC (rev 101912)
@@ -83,12 +83,6 @@
         checker=".to22.check_action_icons"
         />
 
-    <genericsetup:upgradeStep
-        title="Add action link target"
-        handler=".to22.add_action_linktargets"
-        checker=".to22.check_action_linktargets"
-        />
-
   </genericsetup:upgradeSteps>
 
   <genericsetup:upgradeStep

Modified: Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to22.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to22.py	2009-07-14 17:05:07 UTC (rev 101911)
+++ Products.CMFDefault/trunk/Products/CMFDefault/upgrade/to22.py	2009-07-14 17:08:28 UTC (rev 101912)
@@ -17,7 +17,6 @@
 import logging
 from urllib import quote
 
-from Acquisition import aq_base
 from Acquisition import aq_inner
 from Acquisition import aq_parent
 from zope.component.interfaces import ComponentLookupError
@@ -125,49 +124,3 @@
                 changed = True
         if changed:
             logger.info("TypeInfo '%s' changed." % ti.getId())
-
-def check_action_linktargets(tool):
-    """2.1.x to 2.2.0 upgrade step checker
-    """
-    # Actions in portal_actions tool
-    atool = getToolByName(tool, 'portal_actions')
-    for ai in atool.listActions():
-        if getattr(aq_base(ai), 'link_target', None) is None:
-            return True
-
-    # Actions from TypeInformation objects
-    ttool = getToolByName(tool, 'portal_types')
-    for ti in ttool.listTypeInfo():
-        if getattr(aq_base(ti), 'link_target', None) is None:
-            return True
-
-        for ai in ti.listActions():
-            if getattr(aq_base(ai), 'link_target', None) is None:
-                return True
-    return False
-
-def add_action_linktargets(tool):
-    """2.1.x to 2.2.0 upgrade step handler
-    """
-    logger = logging.getLogger('GenericSetup.upgrade')
-
-    # Actions in portal_actions tool
-    atool = getToolByName(tool, 'portal_actions')
-    for ai in atool.listActions():
-        if getattr(aq_base(ai), 'link_target', None) is None:
-            ai.link_target = ''
-            logger.info('Action "%s" changed.' % ai.getId())
-
-    # Actions from TypeInformation objects
-    ttool = getToolByName(tool, 'portal_types')
-    for ti in ttool.listTypeInfo():
-        if getattr(aq_base(ti), 'link_target', None) is None:
-            ti.link_target = ''
-            logger.info("TypeInfo '%s' changed." % ti.getId())
-
-        for ai in ti.listActions():
-            if getattr(aq_base(ai), 'link_target', None) is None:
-                ai.link_target = ''
-                msg = 'TypeInfo "%s" action "%s" changed.'
-                logger.info(msg % (ti.getId(), ai.getId()))
-