Changeset c8a3a93 in indico for indico/MaKaC/rb_reservation.py

Timestamp:

03/22/12 18:05:24 (14 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

2626c2

Parents:

b49d75

Message:

[FIX] Needs assistance modification - Notif

File:

• indico/MaKaC/rb_reservation.py (modified) (3 diffs)

indico/MaKaC/rb_reservation.py

@@ -489 +489 @@
         return emails
 
-    def notifyAboutUpdate( self ):
+    def notifyAboutUpdate( self, attrsBefore ):
         """
         FINAL (not intented to be overriden)
@@ -558 +558 @@
         # ---- Email Assistance ----
 
-        if getRoomBookingOption('assistanceNotificationEmails') and self.room.resvNotificationAssistance:
+        if getRoomBookingOption('assistanceNotificationEmails') and self.room.resvNotificationAssistance and (attrsBefore.get('needsAssistance', False) or self.needsAssistance):
             to = getRoomBookingOption('assistanceNotificationEmails')
             if to:
@@ -566 +566 @@
                 else:
                     user = None
-                subject = "[Support Request Modification][" + self.room.getFullName() + "] Modified request for " + formatDateTime(self.startDT)
+                hasCancelled = attrsBefore.get('needsAssistance', False) and not self.needsAssistance
+                textHeader = "Cancelled" if hasCancelled else "Modification"
+                subject = "[Support Request "+textHeader+"][" + self.room.getFullName() + "] Modified request for " + formatDateTime(self.startDT)
                 wc = WTemplated( 'RoomBookingEmail_AssistanceAfterBookingModification' )
-                text = wc.getHTML( { 'reservation': self, 'currentUser': user } )
+                text = wc.getHTML( { 'reservation': self, 'currentUser': user, 'hasCancelled': hasCancelled } )
                 fromAddr = Config.getInstance().getNoReplyEmail()
                 addrs = []