Changeset 622 for WAeUP_SRP/trunk/skins

Timestamp:

8 Oct 2006, 14:46:25 (18 years ago)

Author:

joachim

Message:

added base files for accommodation-module,
renamed Accommodation to AccoHall?
accommodation to acco_hall
one can now add and view an accommodation-hall

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_academics/searchAcademics.py (modified) (4 diffs)
• waeup_accommodation (added)
• waeup_accommodation/acco_hall_view.pt (added)
• waeup_accommodation/accommodation_index.py (added)
• waeup_accommodation/accommodation_view.pt (added)
• waeup_accommodation/getAccoHallsInfo.py (added)
• waeup_accommodation/getHallInfo.py (added)
• waeup_student/searchStudents.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_academics/searchAcademics.py

@@ -29 +29 @@
         'search_string': ''
         }
+choosen_ids = request.get('ids',[])
 
 rend,psm,ds = lt.renderLayout(layout_id= 'academics_search',
@@ -44 +45 @@
                              objects = items,
                              is_manager = is_manager,
+                             choosen_ids = choosen_ids,
                              )
-what = ds.get('search_mode')
-state = ds.get('review_state')
-term = ds.get('search_string')
-if not term and not with_review:
-    return context.academics_search_view(rendered = rend,
-                             psm = "You must specify a search string",
-                             #psm = "%s, %s" % (psm,ds),
-                             objects = items,
-                             is_manager = is_manager,
-                             )
-with_review = state != "all"
 what = ds.get('search_mode')
 state = ds.get('review_state')
@@ -73 +64 @@
                              students = items,
                              is_manager = is_manager,
+                             choosen_ids = choosen_ids,
                              )
 with_review = state != "all"
@@ -106 +98 @@
                              objects = objects,
                              is_manager = is_manager,
-                             choosen_ids = []
+                             choosen_ids = choosen_ids,
                              )

WAeUP_SRP/trunk/skins/waeup_student/searchStudents.py

@@ -73 +73 @@
 onlyreview = with_review and not term
 if onlyreview:
-    res = catalog(portal_type='Student',
+    res = catalog(portal_type=portal_type_query,
                   review_state=state)
 elif what == "student_id":
@@ -95 +95 @@
     if with_review:
         try:
-            res = catalog(portal_type='Student',SearchableText=st,
+            res = catalog(portal_type=pt,SearchableText=st,
                           review_state=state)
         except: