Changeset 8ca1b0 in indico

Timestamp:

02/17/11 17:20:11 (2 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, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

e6d9f55

Parents:

e92836

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (01/18/11 16:30:15)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (02/17/11 17:20:11)

Message:

[IMP] Add option for notification sender address

• defaults to support or noreply address

Location:

indico/MaKaC

Files:

• registration.py (modified) (6 diffs)
• webinterface/pages/registrationForm.py (modified) (5 diffs)
• webinterface/rh/registrationFormModif.py (modified) (1 diff)
• webinterface/tpls/ConfModifRegForm.tpl (modified) (3 diffs)
• webinterface/tpls/ConfModifRegFormDataModification.tpl (modified) (1 diff)

indico/MaKaC/registration.py

@@ -126 +126 @@
         form.setActivated(self.isActivated())
         form.setMandatoryAccount(self.isMandatoryAccount())
+        form.setNotificationSender(self.getNotificationSender())
         form.setSendRegEmail(self.isSendRegEmail())
         form.setSendReceiptEmail(self.isSendReceiptEmail())
@@ -206 +207 @@
     def setMandatoryAccount(self, v=True):
         self._mandatoryAccount = v
+
+    def setNotificationSender(self, sender):
+        self._notificationSender = sender
+
+    def getNotificationSender(self):
+        sender = None
+        try:
+            if self._notificationSender:
+                sender = self._notificationSender
+        except AttributeError, e:
+            pass
+        if not sender:
+            self._notificationSender = self._conf.getSupportEmail(returnNoReply=True).split(',', 1)[0]
+        return self._notificationSender
 
     def isSendRegEmail(self):
@@ -728 +743 @@
             Creates an email to be sent to the user after registration
         """
-        fromAddr=regForm.getConference().getSupportEmail(returnNoReply=True)
+        fromAddr = regForm.getNotificationSender()
         url = urlHandlers.UHConferenceDisplay.getURL(regForm.getConference())
 
@@ -789 +804 @@
         if not registrant.getConference().getModPay().isEnableSendEmailPaymentDetails():
             return
-        fromAddr=registrant.getConference().getSupportEmail(returnNoReply=True)
+        fromAddr = regForm.getNotificationSender()
         date=registrant.getConference().getStartDate()
         getTitle=strip_ml_tags(registrant.getConference().getTitle())
@@ -862 +877 @@
 
     def sendEmailNewRegistrantConfirmPay(self, regForm,registrant):
-        fromAddr=registrant.getConference().getSupportEmail(returnNoReply=True)
+        fromAddr = regForm.getNotificationSender()
         date=registrant.getConference().getStartDate()
         getTitle=strip_ml_tags(registrant.getConference().getTitle())
@@ -929 +944 @@
 
     def sendEmailModificationRegistrant(self, regForm, rp):
-        fromAddr=regForm.getConference().getSupportEmail(returnNoReply=True)
+        fromAddr = regForm.getNotificationSender()
         subject= _("""Registration modified for '%s': %s""")%(strip_ml_tags(regForm.getConference().getTitle()), rp.getFullName())
         body= _("""

indico/MaKaC/webinterface/pages/registrationForm.py

@@ -214 +214 @@
         vars["disablePic"]=quoteattr(str(Configuration.Config.getInstance().getSystemIconURL( "disabledSection" )))
         if regForm.isActivated():
+            vars["activated"] = True
             vars["changeTo"] = "False"
             vars["status"] =  _("ENABLED")
@@ -253 +254 @@
             if not regForm.isMandatoryAccount():
                 vars["mandatoryAccount"] =  _("No")
+            vars["notificationSender"] = regForm.getNotificationSender()
             vars["sendRegEmail"] = _("Yes")
             if not regForm.isSendRegEmail():
@@ -264 +266 @@
             vars["Currency"]=regForm.getCurrency()
         else:
+            vars["activated"] = False
             vars["changeTo"] = "True"
             vars["status"] =_("DISABLED")
@@ -279 +282 @@
             vars["notification"] = ""
             vars["mandatoryAccount"] = ""
+            vars["notificationSender"] = ""
             vars["sendRegEmail"] = ""
             vars["sendReceiptEmail"] = ""
@@ -340 +344 @@
         if regForm.isMandatoryAccount():
             vars["mandatoryAccount"]= "CHECKED"
+        vars["notificationSender"] = regForm.getNotificationSender()
         vars["sendRegEmail"] = ""
         vars["sendReceiptEmail"] = ""

indico/MaKaC/webinterface/rh/registrationFormModif.py

@@ -127 +127 @@
             regForm.getNotification().setCCList( utils.getEmailList(params.get("ccList", "")) )
             regForm.setMandatoryAccount(params.has_key("mandatoryAccount"))
+            regForm.setNotificationSender(params["notificationSender"])
             regForm.setSendRegEmail(params.has_key("sendRegEmail"))
             regForm.setSendReceiptEmail(params.has_key("sendReceiptEmail"))

indico/MaKaC/webinterface/tpls/ConfModifRegForm.tpl

@@ -66 +66 @@
   </tr>
   <tr>
+    <td class="dataCaptionTD"><span class="dataCaptionFormat"> <%= _("Email notification sender address")%></span></td>
+    <td class="blacktext">
+      %(notificationSender)s
+    </td>
+  </tr>
+  <tr>
     <td class="dataCaptionTD"><span class="dataCaptionFormat"> <%= _("Email notification (on new registrations)")%></span></td>
     <td class="blacktext">
@@ -72 +78 @@
   </tr>
   <tr>
-    <td class="dataCaptionTD"><span class="dataCaptionFormat"> <%= _("Email registrant:")%></span></td>
+    <td class="dataCaptionTD"><span class="dataCaptionFormat"> <%= _("Email registrant")%></span></td>
     <td bgcolor="white" width="100%%">
+      <% if activated: %>
       <table>
         <tr>
@@ -88 +95 @@
         </tr>
       </table>
+      <% end %>
     </td>
   </tr>

indico/MaKaC/webinterface/tpls/ConfModifRegFormDataModification.tpl

@@ -86 +86 @@
     </tr>
     <tr>
+      <td nowrap class="titleCellTD"><span class="titleCellFormat"> <%= _("Email notification sender address")%></span></td>
+      <td bgcolor="white" width="100%%"><input type="text" size="50" name="notificationSender" value="%(notificationSender)s"></td>
+    </tr>
+    <tr>
       <td nowrap class="titleCellTD">
         <span class="titleCellFormat"> <%= _("Email organisators")%></span><br>