[Checkins] SVN: ldapadapter/trunk/ Restrict vocabulary to only registered LDAPAdapters. Note that LDAPAdapters

Martijn Faassen faassen at infrae.com
Mon Oct 2 09:22:56 EDT 2006


Log message for revision 70476:
  Restrict vocabulary to only registered LDAPAdapters. Note that LDAPAdapters
  need to be registered with a name.
  

Changed:
  U   ldapadapter/trunk/CHANGES.txt
  U   ldapadapter/trunk/src/ldapadapter/configure.zcml
  U   ldapadapter/trunk/src/ldapadapter/utility.py

-=-
Modified: ldapadapter/trunk/CHANGES.txt
===================================================================
--- ldapadapter/trunk/CHANGES.txt	2006-10-02 12:41:34 UTC (rev 70475)
+++ ldapadapter/trunk/CHANGES.txt	2006-10-02 13:22:55 UTC (rev 70476)
@@ -13,4 +13,8 @@
 Bugs fixed
 ----------
 
-Nothing yet.
+* The LDAP Adapter Vocabulary list (used by ldappas) was showing an
+  enormous list of irrelevant things. Instead only show those
+  LDAPAdapters that were registered. Note: each ldapadapter must be
+  registered with a particular *name* for it to show up properly in
+  the user interface of ldappas now...

Modified: ldapadapter/trunk/src/ldapadapter/configure.zcml
===================================================================
--- ldapadapter/trunk/src/ldapadapter/configure.zcml	2006-10-02 12:41:34 UTC (rev 70475)
+++ ldapadapter/trunk/src/ldapadapter/configure.zcml	2006-10-02 13:22:55 UTC (rev 70476)
@@ -27,7 +27,7 @@
 
   <utility
       provides="zope.schema.interfaces.IVocabularyFactory"
-      component="zope.app.component.vocabulary.UtilityVocabulary"
+      component=".utility.LDAPAdapterVocabulary"
       name="LDAP Adapter Names"
       />
 

Modified: ldapadapter/trunk/src/ldapadapter/utility.py
===================================================================
--- ldapadapter/trunk/src/ldapadapter/utility.py	2006-10-02 12:41:34 UTC (rev 70475)
+++ ldapadapter/trunk/src/ldapadapter/utility.py	2006-10-02 13:22:55 UTC (rev 70476)
@@ -20,6 +20,7 @@
 import persistent
 import zope.interface
 from zope.app.container.contained import Contained
+from zope.app.component.vocabulary import UtilityVocabulary
 
 from ldapadapter import interfaces
 
@@ -174,3 +175,7 @@
         self.useSSL = useSSL
 
     serverURL = property(LDAPAdapter.getServerURL, _setServerURL)
+
+class LDAPAdapterVocabulary(UtilityVocabulary):
+    interface = interfaces.ILDAPAdapter
+    nameOnly = True



More information about the Checkins mailing list