Changeset 1446 for WAeUP_SRP/trunk/skins/waeup_accommodation/book_reserved_bed.py

Timestamp:

19 Feb 2007, 22:14:47 (18 years ago)

Author:

Henrik Bettermann

Message:

make book_reserved_bed work

File:

• WAeUP_SRP/trunk/skins/waeup_accommodation/book_reserved_bed.py (modified) (5 diffs)

WAeUP_SRP/trunk/skins/waeup_accommodation/book_reserved_bed.py

@@ -72 +72 @@
             break
         if not bed_brain.bed_type.endswith("reserved"):
-            psm = "Not a reserved bed %s" % bid
+            psm = "Not a reserved bed: %s" % bid
             break
         if bed_brain.student and not change:
@@ -85 +85 @@
             break
         if not bed_brain.bed_type.endswith("reserved"):
-            psm = "Not a reserved bed %s" % bid
+            psm = "Not a reserved bed: %s" % bid
             break
         if not bed_brain.student:
@@ -91 +91 @@
             break
     break
-        
+
 if psm != '':
     return context.book_reserved_bed_form(rendered = rendered,
@@ -103 +103 @@
     for bed in already:
         acco_cat.modifyRecord(bed=bed.bed,student='')
-        
+
 students = context.portal_url.getPortalObject().campus.students
 student_obj = getattr(students,sid)
@@ -118 +118 @@
     if acco_id in student_obj.objectIds():
         acco_doc = getattr(student_obj, acco_id).getContent()
-        acco_doc.edit(mapping={'bed': bid + "(removed)"})
-    logger.info('"%s","released reserved bed %s for","%s"' % (member,bid,sid))
-    psm = "Bed %s released for %s" % (sid,student.name)
-    
+        acco_doc.edit(mapping={'bed':bid + " (reservation cancelled by %s!)" % member})
+    logger.info('"%s","cancelled reservation %s by","%s"' % (member,bid,sid))
+    psm = "%s removed from %s" % (student.name,bid)
+
 mode = 'view'
 return context.book_reserved_bed_form(rendered = "",