Changeset 265 for waeup_product/trunk/skins/waeup_faculty

Timestamp:

23 Jun 2006, 08:58:00 (18 years ago)

Author:

lregebro

Message:

Fixed vocabularies lookup.

Location:

waeup_product/trunk/skins/waeup_faculty

Files:

• get_departments_voc.py (modified) (1 diff)
• get_faculties_voc.py (modified) (1 diff)

waeup_product/trunk/skins/waeup_faculty/get_departments_voc.py

@@ -5 +5 @@
 
 """
-#academics = context.sections.portal.academics
-#academics = context.portal_catalog(id = 'academics')[0].getObject()
-#faculties = [f for f in context.filterContents(items=academics.contentValues()) if f.portal_type == 'Faculty']
-
-#return res
-#return [(d.id,d.Title,) for d in res]
 if key is None:
-    res = context.portal_catalog({'meta_type': "Department"})    
+    res = context.portal_catalog.search({'meta_type': "Department"})    
     return [(d.getId,d.Title,) for d in res]
-res = context.portal_catalog({'meta_type': "Department", 'id': key}) 
-return res[-1].Title
-return [(d.getId,d.title_or_id(),) for d in res][-1]
-
-#return [d.title_or_id() for d in deplist if d.getId() == key][0]
-#return [(d.getId(),d.title_or_id()) for d in deplist if d.getId() == key]
+dep = context.portal_catalog.search({'meta_type': "Department", 'id': key})[-1]
+return dep.Title

waeup_product/trunk/skins/waeup_faculty/get_faculties_voc.py

@@ -5 +5 @@
 
 """
-academics = context.portal_catalog(id = 'academics')[-1].getObject()
-items = [i for i in context.filterContents(items=academics.contentValues()) if i.portal_type == 'Faculty']
-context.REQUEST.set('items', items)
-context.REQUEST.set('key', key)
-if not key:
-    return [(f.getId(),f.title_or_id(),) for f in items]
-return [f.title_or_id() for f in items if f.getId() == key][0]
-return [(f.getId(),f.title_or_id()) for f in items if f.getId() == key]
-
+if key is None:
+    res = context.portal_catalog.search({'meta_type': "Faculty"})    
+    return [(d.getId,d.Title,) for d in res]
+dep = context.portal_catalog.search({'meta_type': "Faculty", 'id': key})[-1]
+return dep.Title