Changeset 2625 in products for quintagroup.gauth

Timestamp:

Jul 6, 2010 9:45:18 AM (14 years ago)

Author:

mylan

Message:

Fixed action icon uninstallation (removed by QI)

Location:

quintagroup.gauth/trunk/quintagroup/gauth

Files:

• setuphandlers.py (modified) (2 diffs)
• tests.py (modified) (1 diff)

quintagroup.gauth/trunk/quintagroup/gauth/setuphandlers.py

@@ -30 +30 @@
     removeGauthProperties(site)
     removeConfiglet(site)
-    removeActionIcons(site)
+    #removeActionIcons(site)
 
 def unregisterUtility(site):
@@ -61 +61 @@
 def removeActionIcons(site):
     pai = getToolByName(site, "portal_actionicons")
-    if not "quintagroup.gauth" in pai.objectIds():
-        logger.log(logging.WARN, "No 'quintagroup.gauth' configlet.")
+    import pdb;pdb.set_trace()
+    ai = pai.queryActionInfo("controlpanel", "quintagroup.gauth", default=None)
+    if ai is None:
+        logger.log(logging.WARN, "No 'quintagroup.gauth' action icon.")
     else:
         pai.manage_removeActionIcon(category="controlpanel", action_id="quintagroup.gauth")

quintagroup.gauth/trunk/quintagroup/gauth/tests.py

@@ -114 +114 @@
     def testActionIcons(self):
         ait = self.portal.portal_actionicons
-        self.assertRaises(KeyError, ait.getActionInfo,
-            ait, "controlpanel", "quintagroup.gauth")
+        ai = ait.queryActionInfo("controlpanel", "quintagroup.gauth", default=None)
+        self.assert_(ai == None)