Changeset a6c717 in indico

Timestamp:

06/07/10 18:50:14 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

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

Children:

e3ef9c

Parents:

16a6b5

git-author:

Ian Rolewicz <ian.rolewicz@…> (05/05/10 13:27:47)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (06/07/10 18:50:14)

Message:

[IMP] RecReq? and Webcast notif email enhancement

• fixes #27
• Notification emails for recording and webcast responsibles, sent when a recording or webcast request is accepted, now includes the name of the responsible who accepted the request.

Location:

indico/MaKaC

Files:

• plugins/Collaboration/RecordingRequest/collaboration.py (modified) (2 diffs)
• plugins/Collaboration/RecordingRequest/common.py (modified) (1 diff)
• plugins/Collaboration/RecordingRequest/mail.py (modified) (2 diffs)
• plugins/Collaboration/WebcastRequest/collaboration.py (modified) (2 diffs)
• plugins/Collaboration/WebcastRequest/mail.py (modified) (2 diffs)
• plugins/Collaboration/base.py (modified) (3 diffs)
• services/implementation/collaboration.py (modified) (1 diff)
• services/interface/rpc/process.py (modified) (3 diffs)

indico/MaKaC/plugins/Collaboration/RecordingRequest/collaboration.py

@@ -111 +111 @@
         pass
 
-    def _accept(self):
+    def _accept(self, user = None):
         self._statusMessage = "Request accepted"
         self._statusClass = "statusMessageOK"
@@ -127 +127 @@
         if MailTools.needToSendEmails('RecordingRequest'):
             try:
-                notificationAdmin = RequestAcceptedNotificationAdmin(self)
+                notificationAdmin = RequestAcceptedNotificationAdmin(self, user)
                 GenericMailer.sendAndLog(notificationAdmin, self.getConference(),
                                      "MaKaC/plugins/Collaboration/RecordingRequest/collaboration.py",

indico/MaKaC/plugins/Collaboration/RecordingRequest/common.py

@@ -99 +99 @@
 
     def __init__(self, operation, inner):
-        CSErrorBase.__init__(self)
         self._operation = operation
         self._inner = inner

indico/MaKaC/plugins/Collaboration/RecordingRequest/mail.py

@@ -405 +405 @@
     """
 
-    def __init__(self, booking):
+    def __init__(self, booking, user = None):
         RecordingRequestAdminNotificationBase.__init__(self, booking)
 
@@ -411 +411 @@
                         % (self._conference.getTitle(), str(self._conference.getId())))
 
+        userInfo = ""
+        if user :
+            userInfo = " by %s %s"%(user.getFirstName(), user.getFamilyName().upper())
         self.setBody("""Dear Recording Responsible,<br />
 <br />
-A recording request for the event: "%s" has been accepted in <a href="%s">%s</a><br />
+A recording request for the event: "%s" has been accepted in <a href="%s">%s</a>"""%(self._conference.getTitle(),
+                                                                                     MailTools.getServerName(),
+                                                                                     MailTools.getServerName())
++ userInfo + """.<br />
 Click <a href="%s">here</a> to view the request.<br />
 
-""" % ( self._conference.getTitle(),
-        MailTools.getServerName(),
-        MailTools.getServerName(),
-        self._modifLink
-      ))
+""" % ( self._modifLink ))
 
 

indico/MaKaC/plugins/Collaboration/WebcastRequest/collaboration.py

@@ -108 +108 @@
         pass
 
-    def _accept(self):
+    def _accept(self, user = None):
         self._statusMessage = "Request accepted"
         self._statusClass = "statusMessageOK"
@@ -126 +126 @@
         if MailTools.needToSendEmails('WebcastRequest'):
             try:
-                notification = RequestAcceptedNotificationAdmin(self)
+                notification = RequestAcceptedNotificationAdmin(self, user)
                 GenericMailer.sendAndLog(notification, self.getConference(),
                                      "MaKaC/plugins/Collaboration/WebcastRequest/collaboration.py",

indico/MaKaC/plugins/Collaboration/WebcastRequest/mail.py

@@ -406 +406 @@
     """
 
-    def __init__(self, booking):
+    def __init__(self, booking, user = None):
         WebcastRequestAdminNotificationBase.__init__(self, booking)
 
@@ -412 +412 @@
                         % (self._conference.getTitle(), str(self._conference.getId())))
 
+        userInfo = ""
+        if user :
+            userInfo = " by %s %s" %(user.getFirstName(), user.getFamilyName().upper())
         self.setBody("""Dear Webcast Responsible,<br />
 <br />
-A webcast request for the event: "%s" has been accepted in <a href="%s">%s</a><br />
+A webcast request for the event: "%s" has been accepted in <a href="%s">%s</a>""" %(self._conference.getTitle(),
+                                                                                    MailTools.getServerName(),
+                                                                                    MailTools.getServerName())
++ userInfo + """.<br />
 Click <a href="%s">here</a> to view the request.<br />
 
-""" % ( self._conference.getTitle(),
-        MailTools.getServerName(),
-        MailTools.getServerName(),
-        self._modifLink
-      ))
+""" % (self._modifLink))
 
 

indico/MaKaC/plugins/Collaboration/base.py

@@ -374 +374 @@
             raise ServiceError(_("Tried to check status of booking ") + str(id) + _(" of meeting ") + str(self._conf.getId()) + _(" but this booking does not support the check status service."))
 
-    def acceptBooking(self, id):
+    def acceptBooking(self, id, user = None):
         booking = self._bookings[id]
         if booking.hasAcceptReject():
             if booking.getAcceptRejectStatus() is None:
                 self._removeFromPendingIndex(booking)
-            booking.accept()
+            booking.accept(user)
             return booking
         else:
@@ -1019 +1019 @@
         return self._statusClass
 
-    def accept(self):
+    def accept(self, user = None):
         """ Sets this booking as accepted
         """
         self._acceptRejectStatus = True
-        self._accept()
+        self._accept(user)
 
     def reject(self, reason):
@@ -1456 +1456 @@
             pass
 
-    def _accept(self):
+    def _accept(self, user = None):
         """ To be overriden by inheriting classes
             This method is called when a user with privileges presses the "Accept" button

indico/MaKaC/services/implementation/collaboration.py

@@ -189 +189 @@
     """
     def _getAnswer(self):
-        return fossilize(self._CSBookingManager.acceptBooking(self._bookingId),
+        return fossilize(self._CSBookingManager.acceptBooking(self._bookingId, self.getAW().getUser()),
                                   None, tz = self._conf.getTimezone())
 

indico/MaKaC/services/interface/rpc/process.py

@@ -22 +22 @@
         handler = endpoint.methodMap.get(functionName, None)
         if handler != None:
-            break        
+            break
         try:
             endpointName, functionName = method.split(".", 1)
@@ -34 +34 @@
         else:
             raise RequestError("ERR-R1", "Unsupported method")
-        
+
     return handler
 
@@ -110 +110 @@
         if minfo.getRoomBookingModuleActive():
             CrossLocationDB.connect()
-        
+
 def _endRequestSpecific2RH( commit = True ):
     minfo = info.HelperMaKaCInfo.getMaKaCInfoInstance()
     if minfo.getRoomBookingModuleActive():
-        if commit: 
+        if commit:
             CrossLocationDB.commit()
-        else: 
+        else:
             CrossLocationDB.rollback()
         CrossLocationDB.disconnect()