Changeset 45a4a3 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, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

880a3e, 66d952

Parents:

f8d0a1

git-author:

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

git-committer:

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

Message:

[MIN] Get rid of EMAIL_FROM_PREFIX

• in favor of MaKaCInfo.getNoReplyEmail
• fixes #728

File:

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

indico/MaKaC/rb_reservation.py

@@ -63 +63 @@
     week2desc = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday' ]
 
-# Room booking module notifications will be send to this e-mail when debug is on
-EMAIL_FROM_PREFIX = "noreply-"
-
 class ReservationBase( object ):
     """
@@ -145 +142 @@
                 wc = WTemplated( 'RoomBookingEmail_2UserAfterPreBookingInsertion' )
             text = wc.getHTML( { 'reservation':self, 'firstName':firstName } )
-            fromAddr = EMAIL_FROM_PREFIX+HelperMaKaCInfo.getMaKaCInfoInstance().getSupportEmail()
+            fromAddr = HelperMaKaCInfo.getMaKaCInfoInstance().getNoReplyEmail(returnSupport=True)
             addrs = []
             if to:
@@ -169 +166 @@
         text = wc.getHTML( { 'reservation':self, 'bookingMessage': bookingMessage } )
 
-        fromAddr = EMAIL_FROM_PREFIX+HelperMaKaCInfo.getMaKaCInfoInstance().getSupportEmail()
+        fromAddr = HelperMaKaCInfo.getMaKaCInfoInstance().getNoReplyEmail(returnSupport=True)
         addrs = []
         addrs.append( toMain )
@@ -186 +183 @@
                 wc = WTemplated( 'RoomBookingEmail_2AVCSupportAfterBookingInsertion' )
                 text = wc.getHTML( { 'reservation': self } )
-                fromAddr = EMAIL_FROM_PREFIX+HelperMaKaCInfo.getMaKaCInfoInstance().getSupportEmail()
+                fromAddr = HelperMaKaCInfo.getMaKaCInfoInstance().getNoReplyEmail(returnSupport=True)
                 addrs = []
                 addrs += to
@@ -224 +221 @@
             wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingCancellation' )
             text = wc.getHTML( { 'reservation':self, 'date':date, 'firstName':firstName } )
-            fromAddr = EMAIL_FROM_PREFIX+HelperMaKaCInfo.getMaKaCInfoInstance().getSupportEmail()
+            fromAddr = HelperMaKaCInfo.getMaKaCInfoInstance().getNoReplyEmail(returnSupport=True)
             addrs = []
             if to:
@@ -242 +239 @@
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingCancellation' )
         text = wc.getHTML( { 'reservation':self, 'date':date } )
-        fromAddr = EMAIL_FROM_PREFIX+HelperMaKaCInfo.getMaKaCInfoInstance().getSupportEmail()
+        fromAddr = HelperMaKaCInfo.getMaKaCInfoInstance().getNoReplyEmail(returnSupport=True)
         addrs = []
         addrs.append( toMain )
@@ -259 +256 @@
                 wc = WTemplated( 'RoomBookingEmail_2AVCSupportAfterBookingCancellation' )
                 text = wc.getHTML( { 'reservation': self } )
-                fromAddr = EMAIL_FROM_PREFIX+HelperMaKaCInfo.getMaKaCInfoInstance().getSupportEmail()
+                fromAddr = HelperMaKaCInfo.getMaKaCInfoInstance().getNoReplyEmail(returnSupport=True)
                 addrs = []
                 addrs += to
@@ -298 +295 @@
             wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingRejection' )
             text = wc.getHTML( { 'reservation':self, 'firstName':firstName, 'reason':reason, 'date':date } )
-            fromAddr = EMAIL_FROM_PREFIX+HelperMaKaCInfo.getMaKaCInfoInstance().getSupportEmail()
+            fromAddr = HelperMaKaCInfo.getMaKaCInfoInstance().getNoReplyEmail(returnSupport=True)
             addrs = []
             if to:
@@ -315 +312 @@
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingRejection' )
         text = wc.getHTML( { 'reservation':self, 'date':date, 'reason':reason } )
-        fromAddr = EMAIL_FROM_PREFIX+HelperMaKaCInfo.getMaKaCInfoInstance().getSupportEmail()
+        fromAddr = HelperMaKaCInfo.getMaKaCInfoInstance().getNoReplyEmail(returnSupport=True)
         addrs = []
         addrs.extend( toCustom )
@@ -349 +346 @@
             wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingConfirmation' )
             text = wc.getHTML( { 'reservation':self, 'firstName':firstName } )
-            fromAddr = EMAIL_FROM_PREFIX+HelperMaKaCInfo.getMaKaCInfoInstance().getSupportEmail()
+            fromAddr = HelperMaKaCInfo.getMaKaCInfoInstance().getNoReplyEmail(returnSupport=True)
             addrs = []
             if to:
@@ -366 +363 @@
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingConfirmation' )
         text = wc.getHTML( { 'reservation':self } )
-        fromAddr = EMAIL_FROM_PREFIX+HelperMaKaCInfo.getMaKaCInfoInstance().getSupportEmail()
+        fromAddr = HelperMaKaCInfo.getMaKaCInfoInstance().getNoReplyEmail(returnSupport=True)
         addrs = []
         addrs.extend( toCustom )
@@ -380 +377 @@
                 wc = WTemplated( 'RoomBookingEmail_2AVCSupportAfterBookingInsertion' )
                 text = wc.getHTML( { 'reservation': self } )
-                fromAddr = EMAIL_FROM_PREFIX+HelperMaKaCInfo.getMaKaCInfoInstance().getSupportEmail()
+                fromAddr = HelperMaKaCInfo.getMaKaCInfoInstance().getNoReplyEmail(returnSupport=True)
                 addrs = []
                 addrs += to
@@ -413 +410 @@
             wc = WTemplated( 'RoomBookingEmail_2UserAfterBookingModification' )
             text = wc.getHTML( { 'reservation':self, 'firstName':firstName } )
-            fromAddr = EMAIL_FROM_PREFIX+HelperMaKaCInfo.getMaKaCInfoInstance().getSupportEmail()
+            fromAddr = HelperMaKaCInfo.getMaKaCInfoInstance().getNoReplyEmail(returnSupport=True)
             addrs = []
             if to:
@@ -431 +428 @@
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleAfterBookingModification' )
         text = wc.getHTML( { 'reservation':self } )
-        fromAddr = EMAIL_FROM_PREFIX+HelperMaKaCInfo.getMaKaCInfoInstance().getSupportEmail()
+        fromAddr = HelperMaKaCInfo.getMaKaCInfoInstance().getNoReplyEmail(returnSupport=True)
         addrs = []
         addrs.append( toMain )
@@ -448 +445 @@
                 wc = WTemplated( 'RoomBookingEmail_2AVCSupportAfterBookingModification' )
                 text = wc.getHTML( { 'reservation': self } )
-                fromAddr = EMAIL_FROM_PREFIX+HelperMaKaCInfo.getMaKaCInfoInstance().getSupportEmail()
+                fromAddr = HelperMaKaCInfo.getMaKaCInfoInstance().getNoReplyEmail(returnSupport=True)
                 addrs = []
                 addrs += to
@@ -483 +480 @@
             wc = WTemplated( 'RoomBookingEmail_2UserRequestProlongation' )
             text = wc.getHTML( { 'reservation':self, 'firstName':firstName } )
-            fromAddr = EMAIL_FROM_PREFIX+HelperMaKaCInfo.getMaKaCInfoInstance().getSupportEmail()
+            fromAddr = HelperMaKaCInfo.getMaKaCInfoInstance().getNoReplyEmail(returnSupport=True)
             addrs = []
             if to:
@@ -511 +508 @@
         wc = WTemplated( 'RoomBookingEmail_2ResponsibleConsiderRejecting' )
         text = wc.getHTML( { 'reservation':self } )
-        fromAddr = EMAIL_FROM_PREFIX+HelperMaKaCInfo.getMaKaCInfoInstance().getSupportEmail()
+        fromAddr = HelperMaKaCInfo.getMaKaCInfoInstance().getNoReplyEmail(returnSupport=True)
         addrs = []
         addrs.append( toMain )