Changeset 55b3c5 in indico

Timestamp:

11/18/10 17:50:51 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

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

Children:

9043f3

Parents:

156859

git-author:

Leszek Syroka <leszek.marek.syroka@…> (11/17/10 16:50:50)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (11/18/10 17:50:51)

Message:

[FIX] Simplify rb email subject

• subject of indico roombooking emails were simplified
• fix#528

File:

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

indico/MaKaC/rb_reservation.py

@@ -71 +71 @@
 
 # Room booking module notifications will be send to this e-mail when debug is on
-NOTIFICATION_SUBJECT_PREFIX = "[CRBS] "
+NOTIFICATION_SUBJECT_PREFIX = ""
 
 # Carbon copy of ALL room booking notifications will be send to this email
@@ -150 +150 @@
 
             if self.isConfirmed:
-                subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] You have made a New Booking on " + formatDateTime(self.startDT)
+                subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] New Booking on " + formatDateTime(self.startDT)
                 wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingInsertion' )
             else:
-                subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Your PRE-Booking waits for Acceptance"
+                subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] PRE-Booking waiting Acceptance"
                 wc = WTemplated( 'RoomBookingEmail_2UserAfterPreBookingInsertion' )
             text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self, 'firstName':firstName } )
@@ -177 +177 @@
 
         if self.isConfirmed:
-            subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] New Booking on " + formatDateTime(self.startDT)
+            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + 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 = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] New PRE-Booking on " + formatDateTime(self.startDT)
             bookingMessage = "PRE-book"
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingInsertion' )
@@ -204 +204 @@
             to = Location.parse( self.locationName ).getAVCSupportEmails()
             if to:
-                subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] New Booking on " + formatDateTime(self.startDT)
+                subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] New Booking on " + formatDateTime(self.startDT)
                 wc = WTemplated( 'RoomBookingEmail_2AVCSupportAfterBookingInsertion' )
                 text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation': self } )
@@ -248 +248 @@
             to2 = self._getContactEmailList()
 
-            subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Cancellation Confirmation on " + startDate + " %s" % occurrenceText
+            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Cancellation Confirmation on " + startDate + " %s" % occurrenceText
             wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingCancellation' )
             text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self, 'date':date, 'firstName':firstName } )
@@ -271 +271 @@
         toCustom = self._getNotificationEmailList()
 
-        subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Cancelled Booking on " + startDate + " %s" % occurrenceText
+        subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Cancelled Booking on " + startDate + " %s" % occurrenceText
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingCancellation' )
         text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self, 'date':date } )
@@ -293 +293 @@
             to = Location.parse( self.locationName ).getAVCSupportEmails()
             if to:
-                subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Booking Cancelled on " + startDate
+                subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Booking Cancelled on " + startDate
                 wc = WTemplated( 'RoomBookingEmail_2AVCSupportAfterBookingCancellation' )
                 text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation': self } )
@@ -338 +338 @@
             to2 = self._getContactEmailList()
 
-            subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] REJECTED Booking on " + startDate + " %s" % occurrenceText
+            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] REJECTED Booking on " + startDate + " %s" % occurrenceText
             wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingRejection' )
             text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self, 'firstName':firstName, 'reason':reason, 'date':date } )
@@ -360 +360 @@
         toCustom = self._getNotificationEmailList()
 
-        subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Rejected Booking on " + startDate + " %s" % occurrenceText
+        subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Rejected Booking on " + startDate + " %s" % occurrenceText
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingRejection' )
         text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self, 'date':date, 'reason':reason } )
@@ -400 +400 @@
             to2 = self._getContactEmailList()
 
-            subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Confirmed Booking on " + startDate
+            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Confirmed Booking on " + startDate
             wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingConfirmation' )
             text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self, 'firstName':firstName } )
@@ -422 +422 @@
         toCustom = self._getNotificationEmailList()
 
-        subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Confirmed Booking on " + startDate
+        subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Confirmed Booking on " + startDate
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingConfirmation' )
         text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self } )
@@ -441 +441 @@
             to = Location.parse( self.locationName ).getAVCSupportEmails()
             if to:
-                subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] New Booking on " + startDate
+                subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] New Booking on " + startDate
                 wc = WTemplated( 'RoomBookingEmail_2AVCSupportAfterBookingInsertion' )
                 text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation': self } )
@@ -480 +480 @@
             to2 = self._getContactEmailList()
 
-            subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Booking Modified on " + startDate
+            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Booking Modified on " + startDate
             wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingModification' )
             text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self, 'firstName':firstName } )
@@ -503 +503 @@
         toCustom = self._getNotificationEmailList()
 
-        subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Booking Modified on " + startDate
+        subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Booking Modified on " + startDate
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingModification' )
         text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self } )
@@ -525 +525 @@
             to = Location.parse( self.locationName ).getAVCSupportEmails()
             if to:
-                subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Modified booking on " + startDate
+                subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Modified booking on " + startDate
                 wc = WTemplated( 'RoomBookingEmail_2AVCSupportAfterBookingModification' )
                 text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation': self } )
@@ -566 +566 @@
             to2 = self._getContactEmailList()
 
-            subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Request for Booking Prolongation on " + startDate
+            subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Request for Booking Prolongation on " + startDate
             wc = WTemplated( 'RoomBookingEmail_2UserRequestProlongation' )
             text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self, 'firstName':firstName } )
@@ -600 +600 @@
         toCustom = self._getNotificationEmailList()
 
-        subject = NOTIFICATION_SUBJECT_PREFIX + " [" + self.room.getFullName() + "] Consider Rejecting This Booking"
+        subject = NOTIFICATION_SUBJECT_PREFIX + "[" + self.room.getFullName() + "] Consider Rejecting This Booking"
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleConsiderRejecting' )
         text = TEST_VERSION_WARNING + wc.getHTML( { 'reservation':self } )