lib/python/Products/ZCatalog/ZCatalog.py

@@ -115,34 +115,6 @@ def manage_addZCatalog(self, id, title, vocab='', vocab_id='', REQUEST=None):
         return self.manage_main(self, REQUEST)
 
 
-def VocabularyIDs(self):
-    """ returns a list of acquireable vocabularies.  Stole this from
-    ZSQLMethods """
-
-    ids={}
-    have_id=ids.has_key
-    StringType=type('')
-
-    while self is not None:
-        if hasattr(self, 'objectValues'):
-            for o in self.objectValues():
-                if (hasattr(o,'_isAVocabulary') and o._isAVocabulary
-                    and hasattr(o,'id')):
-                    id=o.id
-                    if type(id) is not StringType: id=id()
-                    if not have_id(id):
-                        if hasattr(o,'title_and_id'): o=o.title_and_id()
-                        else: o=id
-                        ids[id]=id
-        if hasattr(self, 'aq_parent'): self=self.aq_parent
-        else: self=None
-
-    ids=map(lambda item: (item[1], item[0]), ids.items())
-    ids.sort()
-    return ids
-
-
-
 class ZCatalog(Folder, Persistent, Implicit):
     """ZCatalog object
 

lib/python/Products/ZCatalog/__init__.py

@@ -112,10 +112,3 @@ def initialize(context):
     context.registerHelp()
 
 
-methods={
-    ## aparently this is bad, but I can't think of any other way!
-    
-    'VocabularyIDs' : ZCatalog.VocabularyIDs,
-    }
-
-

lib/python/Products/ZCatalog/addZCatalog.dtml

@@ -33,9 +33,9 @@
   <TD ALIGN="LEFT" VALIGN="TOP">
   <em>Select Vocabulary?</em> <input type="checkbox" name="vocab">
   <select name="vocab_id">
-    <dtml-in VocabularyIDs>
-      <option value="<dtml-var sequence-item html_quote>">
-        <dtml-var sequence-item>
+    <dtml-in "superValues('Vocabulary')">
+      <option value="<dtml-var id html_quote>">
+        <dtml-var id>
       </option>
     </dtml-in>
   </select><br>