Changeset 2ba3ab in indico

Timestamp:

05/18/11 14:54:52 (2 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 4c7d4152dff271ba5df5a8606605969cab454080

Children:

6dc695

Parents:

345890

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (04/11/11 14:28:02)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (05/18/11 14:54:52)

Message:

[MIN] Get rid of NOTIFICATION_SUBJECT_PREFIX

File:

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

indico/MaKaC/rb_reservation.py

@@ -67 +67 @@
 EMAIL_FROM_PREFIX = "noreply-"
 
-# Room booking module notifications will be send to this e-mail when debug is on
-NOTIFICATION_SUBJECT_PREFIX = ""
-
 # Carbon copy of ALL room booking notifications will be send to this email
 EMAIL_FOR_CATCH_ALL_NOTIFICATIONS = ""
@@ -147 +144 @@
 
             if self.isConfirmed:
-                subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] New Booking on " + formatDateTime(self.startDT)
+                subject = "[" + self.room.getFullName() + "] New Booking on " + formatDateTime(self.startDT)
                 wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingInsertion' )
             else:
-                subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] PRE-Booking waiting Acceptance"
+                subject = "[" + self.room.getFullName() + "] PRE-Booking waiting Acceptance"
                 wc = WTemplated( 'RoomBookingEmail_2UserAfterPreBookingInsertion' )
             text = wc.getHTML( { 'reservation':self, 'firstName':firstName } )
@@ -174 +171 @@
 
         if self.isConfirmed:
-            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] New Booking on " + formatDateTime(self.startDT)
+            subject = "[" + self.room.getFullName() + "] New Booking on " + formatDateTime(self.startDT)
             bookingMessage = "Book"
         else:
-            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] New PRE-Booking on " + formatDateTime(self.startDT)
+            subject = "[" + self.room.getFullName() + "] New PRE-Booking on " + formatDateTime(self.startDT)
             bookingMessage = "PRE-book"
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingInsertion' )
@@ -201 +198 @@
             to = Location.parse( self.locationName ).getAVCSupportEmails()
             if to:
-                subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] New Booking on " + formatDateTime(self.startDT)
+                subject = "[" + self.room.getFullName() + "] New Booking on " + formatDateTime(self.startDT)
                 wc = WTemplated( 'RoomBookingEmail_2AVCSupportAfterBookingInsertion' )
                 text = wc.getHTML( { 'reservation': self } )
@@ -245 +242 @@
             to2 = self._getContactEmailList()
 
-            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Cancellation Confirmation on " + startDate + " %s" % occurrenceText
+            subject = "[" + self.room.getFullName() + "] Cancellation Confirmation on " + startDate + " %s" % occurrenceText
             wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingCancellation' )
             text = wc.getHTML( { 'reservation':self, 'date':date, 'firstName':firstName } )
@@ -268 +265 @@
         toCustom = self._getNotificationEmailList()
 
-        subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Cancelled Booking on " + startDate + " %s" % occurrenceText
+        subject = "[" + self.room.getFullName() + "] Cancelled Booking on " + startDate + " %s" % occurrenceText
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingCancellation' )
         text = wc.getHTML( { 'reservation':self, 'date':date } )
@@ -290 +287 @@
             to = Location.parse( self.locationName ).getAVCSupportEmails()
             if to:
-                subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Booking Cancelled on " + startDate
+                subject = "[" + self.room.getFullName() + "] Booking Cancelled on " + startDate
                 wc = WTemplated( 'RoomBookingEmail_2AVCSupportAfterBookingCancellation' )
                 text = wc.getHTML( { 'reservation': self } )
@@ -335 +332 @@
             to2 = self._getContactEmailList()
 
-            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] REJECTED Booking on " + startDate + " %s" % occurrenceText
+            subject = "[" + self.room.getFullName() + "] REJECTED Booking on " + startDate + " %s" % occurrenceText
             wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingRejection' )
             text = wc.getHTML( { 'reservation':self, 'firstName':firstName, 'reason':reason, 'date':date } )
@@ -357 +354 @@
         toCustom = self._getNotificationEmailList()
 
-        subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Rejected Booking on " + startDate + " %s" % occurrenceText
+        subject = "[" + self.room.getFullName() + "] Rejected Booking on " + startDate + " %s" % occurrenceText
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingRejection' )
         text = wc.getHTML( { 'reservation':self, 'date':date, 'reason':reason } )
@@ -397 +394 @@
             to2 = self._getContactEmailList()
 
-            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Confirmed Booking on " + startDate
+            subject = "[" + self.room.getFullName() + "] Confirmed Booking on " + startDate
             wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingConfirmation' )
             text = wc.getHTML( { 'reservation':self, 'firstName':firstName } )
@@ -419 +416 @@
         toCustom = self._getNotificationEmailList()
 
-        subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Confirmed Booking on " + startDate
+        subject = "[" + self.room.getFullName() + "] Confirmed Booking on " + startDate
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingConfirmation' )
         text = wc.getHTML( { 'reservation':self } )
@@ -438 +435 @@
             to = Location.parse( self.locationName ).getAVCSupportEmails()
             if to:
-                subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] New Booking on " + startDate
+                subject = "[" + self.room.getFullName() + "] New Booking on " + startDate
                 wc = WTemplated( 'RoomBookingEmail_2AVCSupportAfterBookingInsertion' )
                 text = wc.getHTML( { 'reservation': self } )
@@ -477 +474 @@
             to2 = self._getContactEmailList()
 
-            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Booking Modified on " + startDate
+            subject = "[" + self.room.getFullName() + "] Booking Modified on " + startDate
             wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingModification' )
             text = wc.getHTML( { 'reservation':self, 'firstName':firstName } )
@@ -500 +497 @@
         toCustom = self._getNotificationEmailList()
 
-        subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Booking Modified on " + startDate
+        subject = "[" + self.room.getFullName() + "] Booking Modified on " + startDate
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingModification' )
         text = wc.getHTML( { 'reservation':self } )
@@ -522 +519 @@
             to = Location.parse( self.locationName ).getAVCSupportEmails()
             if to:
-                subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Modified booking on " + startDate
+                subject = "[" + self.room.getFullName() + "] Modified booking on " + startDate
                 wc = WTemplated( 'RoomBookingEmail_2AVCSupportAfterBookingModification' )
                 text = wc.getHTML( { 'reservation': self } )
@@ -563 +560 @@
             to2 = self._getContactEmailList()
 
-            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Request for Booking Prolongation on " + startDate
+            subject = "[" + self.room.getFullName() + "] Request for Booking Prolongation on " + startDate
             wc = WTemplated( 'RoomBookingEmail_2UserRequestProlongation' )
             text = wc.getHTML( { 'reservation':self, 'firstName':firstName } )
@@ -597 +594 @@
         toCustom = self._getNotificationEmailList()
 
-        subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Consider Rejecting This Booking"
+        subject = "[" + self.room.getFullName() + "] Consider Rejecting This Booking"
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleConsiderRejecting' )
         text = wc.getHTML( { 'reservation':self } )