Changeset 7059

Timestamp:

9 Nov 2011, 12:40:22 (13 years ago)

Author:

Henrik Bettermann

Message:

Also relocate student if bed_type of bed has changed.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

@@ -1373 +1373 @@
         return selectBed(available_beds)
 
-    # This update method simulates a valid callback und must be
-    # specified in the customization package. The parameters must be taken
-    # from the incoming request.
+    # Relocate student if student parameters have changed or the bed_type
+    # of the bed has changed
     def update(self):
         student = self.context.getStudent()
         acc_details  = self.getAccommodationDetails(student)
-        if acc_details['bt'] == self.context.bed_type:
+        if acc_details['bt'] == self.context.bed_type and \
+                self.context.bed.bed_type == self.context.bed_type:
             self.flash("Bed category hasn't changed. Student can't be relocated.")
             return
-        # Search a bed and exit if no bed is found or if the student
-        # has already booked a bed
+        # Search a bed and exit if no bed is found
         cat = queryUtility(ICatalog, name='beds_catalog', default=None)
         entries = cat.searchResults(
@@ -1393 +1392 @@
                         % acc_details['bt'])
             return
-        entries = cat.searchResults(
-            owner=(student.student_id,student.student_id))
+        #entries = cat.searchResults(
+        #    owner=(student.student_id,student.student_id))
         # Rlease old bed
         try: