Changeset 1451 for WAeUP_SRP/trunk/skins

Timestamp:

20 Feb 2007, 22:17:41 (18 years ago)

Author:

joachim

Message:

fix

File:

• WAeUP_SRP/trunk/skins/waeup_accommodation/book_reserved_bed.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_accommodation/book_reserved_bed.py

@@ -121 +121 @@
     psm = "Bed %s reserved for %s %s" % (bid,sid,student.name)
 elif release:
+    modify = False
     if acco_id in student_obj.objectIds():
         acco_doc = getattr(student_obj, acco_id).getContent()
         if acco_doc.bed != bid:
-            acco_cat.modifyRecord(bed=bid,student='')
-    logger.info('"%s","cancelled reservation %s by","%s"' % (member,bid,sid))
-    psm = "%s removed from %s" % (student.name,bid)
+            modify = True
+    else:
+        modify = True
+    if modify:
+        acco_cat.modifyRecord(bed=bid,student='')
+        logger.info('"%s","cancelled reservation %s by","%s"' % (member,bid,sid))
+        psm = "%s removed from %s" % (student.name,bid)
+    else:
+        psm = "%s removing failed for %s" % (student.name,bid)
+        
 mode = 'view'
 return context.book_reserved_bed_form(rendered = "",