Changeset 843480 in indico

Timestamp:

07/28/11 11:30:26 (22 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

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

Children:

4bf83c

Parents:

39b7d0

git-author:

Alexis Castilla Hernandez <alexis.castilla.hernandez@…> (05/17/11 11:04:06)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (07/28/11 11:30:26)

Message:

[IMP] Allow Co-Authors as CC in Notification TPLs

• Included checkbox in CC Addresses field to enable/disable co-authors as CC addresses
• Deleted line of code not needed (it caused an error) in ConfModCFANotifTplEditData.tpl
• Included new attribute in NotificationTemplate? class
• Closes #452

Files:

• bin/recovery/recovery.py (modified) (1 diff)
• indico/MaKaC/review.py (modified) (4 diffs)
• indico/MaKaC/webinterface/common/abstractNotificator.py (modified) (1 diff)
• indico/MaKaC/webinterface/pages/abstractReviewing.py (modified) (2 diffs)
• indico/MaKaC/webinterface/rh/abstractReviewing.py (modified) (4 diffs)
• indico/MaKaC/webinterface/tpls/ConfModCFANotifTplEditData.tpl (modified) (2 diffs)
• indico/MaKaC/webinterface/tpls/ConfModCFANotifTplNew.tpl (modified) (1 diff)

bin/recovery/recovery.py

@@ -1446 +1446 @@
                 ntpl.setFromAddr(nt.getFromAddr())
                 ntpl.setCCAddrList(nt.getCCAddrList())
+                ntpl.setCAasCCAddr(nt.getCAasCCAddr())
                 for a in nt.getToAddrList():
                     add = TrashCanManager().getById(a._p_oid)

indico/MaKaC/review.py

@@ -1637 +1637 @@
         return self._coAuthors
 
+    def getCoAuthorEmailList(self):
+        emailList = []
+        for coAuthor in self.getCoAuthorList():
+            emailList.append(coAuthor.getEmail())
+        return emailList
+
     def clearCoAuthors(self):
         while len(self._coAuthors)>0:
@@ -3195 +3201 @@
         self._tplBody=""
         self._fromAddr = ""
+        self._CAasCCAddr = False
         self._ccAddrList=PersistentList()
         self._toAddrs = PersistentList()
@@ -3208 +3215 @@
         tpl.setTplBody(self.getTplBody())
         tpl.setFromAddr(self.getFromAddr())
+        tpl.setCAasCCAddr(self.getCAasCCAddr())
 
         for cc in self.getCCAddrList() :
@@ -3317 +3325 @@
             self.addCCAddr(addr)
 
+    def setCAasCCAddr(self, CAasCCAddr):
+        self._CAasCCAddr = CAasCCAddr.
+
+    def getCAasCCAddr(self):
+        try:
+            if self._CAasCCAddr:
+                pass
+        except AttributeError:
+            self._CAasCCAddr = False
+        return self._CAasCCAddr
+
     def clearCCAddrList(self):
         self._ccAddrList=PersistentList()

indico/MaKaC/webinterface/common/abstractNotificator.py

@@ -230 +230 @@
         fa=tpl.getFromAddr()
         cc=tpl.getCCAddrList()
+        # Add Co-authors addresses if needed
+        if tpl.getCAasCCAddr():
+            ccList = cc + abstract.getCoAuthorEmailList()
+        else:
+            ccList = cc
+
         tl = []
         for user in tpl.getToAddrs(abstract):
             if not user.getEmail() in tl:
                 tl.append(user.getEmail())
-        return Notification(subject=subj,body=b,fromAddr=fa,toList=tl,ccList=cc)
+        return Notification(subject=subj,body=b,fromAddr=fa,toList=tl,ccList=ccList)
 
     def notify(self,abstract,tpl):

indico/MaKaC/webinterface/pages/abstractReviewing.py

@@ -235 +235 @@
         vars["notifTpl"] = self._notifTpl
         if not vars.has_key("ccList"):
-            vars["CCAddrs"] = quoteattr(str(",".join(self._notifTpl.getCCAddrList())))
-        else:
-            vars["CCAddrs"] = quoteattr(str(",".join(vars["ccList"])))
+            vars["CCAddrs"] = quoteattr(str(", ".join(self._notifTpl.getCCAddrList())))
+        else:
+            vars["CCAddrs"] = quoteattr(str(", ".join(vars["ccList"])))
+        vars["CAasCCAddr"] = self._notifTpl.getCAasCCAddr()
         return vars
 
@@ -492 +493 @@
         vars["From"] = self._notifTpl.getFromAddr()
         vars["toAddrs"] = self._getToAddrsHTML()
-        vars["CCAddrs"] = ", ".join(self._notifTpl.getCCAddrList())
+        ccAddrs = ", ".join(self._notifTpl.getCCAddrList())
+        if self._notifTpl.getCAasCCAddr():
+            if ccAddrs == "":
+                ccAddrs = "Co-Authors"
+            else:
+                ccAddrs += ", Co-Authors"
+        vars["CCAddrs"] = ccAddrs
         vars["subject"] = self._notifTpl.getTplSubjectShow(EmailNotificator.getVarList())
         vars["body"] = self._notifTpl.getTplBodyShow(EmailNotificator.getVarList())

indico/MaKaC/webinterface/rh/abstractReviewing.py

@@ -61 +61 @@
         self._fromAddr = params.get("fromAddr","")
         self._toList = self._normaliseListParam(params.get("toAddrs",[]))
-        self._ccList = params.get("CCAddrs","").split(",")
+        auxCCList = params.get("CCAddrs","")
+        # replace to have only one separator
+        auxCCList = auxCCList.replace(" ", ",").replace(";", ",").split(",")
+        # clean the list in order to avoid empty emails, for instance, comma at the end
+        cleanList = []
+        for email in auxCCList:
+            if email != "":
+                cleanList.append(email)
+        self._ccList = cleanList
+        self._CAasCCAddr = params.has_key("CAasCCAddr")
         self._cancel = params.get("cancel", None)
         self._save = params.get("save", None)
@@ -99 +108 @@
                 tpl.setFromAddr(self._fromAddr)
                 tpl.setCCAddrList(self._ccList)
+                tpl.setCAasCCAddr(self._CAasCCAddr)
+
                 for toAddr in self._toList:
                     toAddrWrapper = NotifTplToAddrsFactory.getToAddrById(toAddr)
@@ -186 +197 @@
             self._fromAddr=params.get("fromAddr","")
             self._toList=self._normaliseListParam(params.get("toAddrs",[]))
-            self._ccList=params.get("CCAddrs","").split(",")
+            auxCCList = params.get("CCAddrs","")
+            # replace to have only one separator
+            auxCCList = auxCCList.replace(" ", ",").replace(";", ",").split(",")
+            # clean the list in order to avoid empty emails, for instance, comma at the end
+            cleanList = []
+            for email in auxCCList:
+                if email != "":
+                    cleanList.append(email)
+            self._ccList = cleanList
+            self._CAasCCAddr = params.get("CAasCCAddr","")
 
     def _process(self):
@@ -211 +231 @@
                 self._notifTpl.setFromAddr(self._fromAddr)
                 self._notifTpl.setCCAddrList(self._ccList)
+                self._notifTpl.setCAasCCAddr(self._CAasCCAddr)
                 self._notifTpl.clearToAddrs()
                 for toAddr in self._toList:

indico/MaKaC/webinterface/tpls/ConfModCFANotifTplEditData.tpl

@@ -66 +66 @@
         <td nowrap class="titleCellTD"><span class="titleCellFormat"> ${ _("CC addresses")}</span></td>
         <td colspan="2" bgcolor="white" width="100%">
-            <input id="notificationTplCCAddress" type="text" name="CCAddrs"  style="width: 61%;" value=${ CCAddrs } onfocus="selected('notificationTplCCAddress')">
+            <input id="notificationTplCCAddress" type="text" name="CCAddrs"  style="width: 61%;" value=${ CCAddrs } onfocus="selected('notificationTplCCAddress')"><br>
+            <% checked = "" %>
+            % if CAasCCAddr:
+                <% checked = "checked" %>
+            % endif
+            <input name="CAasCCAddr" type="checkbox" ${ checked } id="CAasCCAddr" value="coAuthors"><span>${ _("Co-Authors") }</span>
         </td>
     </tr>
@@ -119 +124 @@
 notifTplManager.addToPM($E('notificationTplBody'));
 
-//Check when the page is loaded
-notifTplManager.checkSelectCondition($E('condTypeSelect'), $E('contribTypeSelect'), $E('trackSelect'));
-
 </script>

indico/MaKaC/webinterface/tpls/ConfModCFANotifTplNew.tpl

@@ -56 +56 @@
         <td nowrap class="titleCellTD"><span class="titleCellFormat"> ${ _("CC addresses")}</span></td>
         <td colspan="2" bgcolor="white" width="100%">
-            <input id="notificationTplCCAddress" type="text" name="CCAddrs"  style="width: 61%;" value=${ CCAddrs } onfocus="selected('notificationTplCCAddress')">
+            <input id="notificationTplCCAddress" type="text" name="CCAddrs"  style="width: 61%;" value=${ CCAddrs } onfocus="selected('notificationTplCCAddress')"><br>
+            <input name="CAasCCAddr" type="checkbox" id="CAasCCAddr" value="coAuthors"><span>${ _("Co-Authors") }</span>
         </td>
     </tr>