[Checkins] SVN: z3ext.controlpanel/trunk/ Fixed configlet subcategory + z3c.baseregistry bug

Nikolay Kim fafhrd at datacom.kz
Mon May 26 01:23:14 EDT 2008


Log message for revision 86953:
  Fixed configlet subcategory + z3c.baseregistry bug

Changed:
  U   z3ext.controlpanel/trunk/CHANGES.txt
  U   z3ext.controlpanel/trunk/src/z3ext/controlpanel/zcml.py

-=-
Modified: z3ext.controlpanel/trunk/CHANGES.txt
===================================================================
--- z3ext.controlpanel/trunk/CHANGES.txt	2008-05-25 22:47:18 UTC (rev 86952)
+++ z3ext.controlpanel/trunk/CHANGES.txt	2008-05-26 05:23:12 UTC (rev 86953)
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+1.2.4 (2008-05-26)
+------------------
+
+- Fixed configlet subcategory + z3c.baseregistry bug
+
+
 1.2.3 (2008-05-14)
 ------------------
 

Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/zcml.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/zcml.py	2008-05-25 22:47:18 UTC (rev 86952)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/zcml.py	2008-05-26 05:23:12 UTC (rev 86953)
@@ -19,7 +19,8 @@
 from zope.schema import getFields
 from zope.interface.common.mapping import IEnumerableMapping
 
-from zope.component import getUtility
+from zope.component import queryUtility, getGlobalSiteManager
+
 from zope.component.zcml import utility
 from zope.component.interface import provideInterface
 
@@ -209,7 +210,10 @@
     else:
         parentId = ''
 
-    parent = getUtility(IConfiglet, parentId)
+    parent = queryUtility(IConfiglet, parentId)
+    if parent is None:
+        parent = getGlobalSiteManager().getUtility(IConfiglet, parentId)
+
     parent.add(configlet.__name__)
     configlet.__parent__ = parent
 



More information about the Checkins mailing list