Changeset 77384a in indico

Timestamp:

02/02/12 17:55:32 (16 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

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

Children:

1d5dc6

Parents:

4ea669

git-author:

Alberto Resco Perez <alberto.resco.perez@…> (01/12/12 14:59:19)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (02/02/12 17:55:32)

Message:

[FIX] Fix previous commit

• Moved the fossil to fossils.py.
• Moved the utils methods in http_apy to collaborationTools.py
• Fossilizing getTitle takes into account if linked to contribution or session in vidyo bookings.
• Fossilizing status fixed.

Location:

indico

Files:

• MaKaC/conference.py (modified) (1 diff)
• MaKaC/plugins/Collaboration/Vidyo/collaboration.py (modified) (2 diffs)
• MaKaC/plugins/Collaboration/collaborationTools.py (modified) (1 diff)
• MaKaC/plugins/Collaboration/fossils.py (modified) (2 diffs)
• MaKaC/plugins/Collaboration/http_api.py (modified) (5 diffs)
• web/http_api/api.py (modified) (1 diff)
• web/http_api/fossils.py (modified) (1 diff)
• web/http_api/ical.py (modified) (1 diff)

indico/MaKaC/conference.py

@@ -6952 +6952 @@
         return self.title
 
+    def getFullTitle( self ):
+        return self.getSession().getTitle() + (": " + self.getTitle() if self.getTitle() else "")
+
     def getName(self):
         return "slot %s"%self.getId()

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

@@ -34 +34 @@
 from MaKaC.common.externalOperationsManager import ExternalOperationsManager
 from MaKaC.plugins.Collaboration.Vidyo.pages import ServiceInformation
+from MaKaC.conference import Contribution, Session
 
 class CSBooking(CSBookingBase):
@@ -274 +275 @@
             if linkObject is None:
                 return _("Removed %s")%_("contribution") if self.isLinkedToContribution() else _("session")
-            if self.isLinkedToContribution():
+            if self.isLinkedToContribution() and isinstance(linkObject, Contribution):
                 title = linkObject.getTitle()
+                linkVideoText = title + " (" + self._linkVideoType + ")"
+            elif self.isLinkedToSession() and isinstance(linkObject, Session):
+                title = linkObject.getSession().getTitle() + (" - " + linkObject.getTitle() if linkObject.getTitle() else "")
+                linkVideoText = title + " (" + self._linkVideoType + ")"
             else:
-                title = linkObject.getSession().getTitle() + (" - " + linkObject.getTitle() if linkObject.getTitle() else "")
-            linkVideoText = title + " (" + self._linkVideoType + ")"
+                linkVideoText = _("Link removed")
         else:
             linkVideoText = _("Whole event")

indico/MaKaC/plugins/Collaboration/collaborationTools.py

@@ -353 +353 @@
         return requestType
 
+    """ The CSBooking object which can be passed through to the fossil
+        may be linked to a Contribution, in the case of WebcastRequest etc,
+        therefore the URL may be more specific than the event in this instance.
+    """
+
+    @classmethod
+    def getConferenceOrContributionURL(cls, event):
+        from MaKaC.webinterface.urlHandlers import UHConferenceDisplay, UHContributionDisplay
+        url = ""
+
+        # Webcast and Recording Request specific:
+        if hasattr(event, '_conf'):
+            event = event._conf
+
+        if isinstance(event, Conference):
+            url = UHConferenceDisplay.getURL(event)
+        elif isinstance(event, Contribution):
+            url = UHContributionDisplay(event)
+
+        return url
+
+    @classmethod
+    def getBookingTitle(cls, booking):
+        title = ""
+        if hasattr(booking, 'getFullTitle'):
+            title = booking.getFullTitle()
+        elif hasattr(booking, 'getTitle'):
+            title = booking.getTitle()
+        elif hasattr(booking, '_getTitle'):
+            title = booking._getTitle()
+        elif hasattr(booking, '_conf'):
+            title = booking._conf.getTitle()
+
+        return title if title is not None else 'No title defined.'
+
 class MailTools(object):
 

indico/MaKaC/plugins/Collaboration/fossils.py

@@ -30 +30 @@
 from MaKaC.fossils.conference import IConferenceFossil
 from MaKaC.common.Conversion import Conversion
+from MaKaC.plugins import Collaboration
 
 
@@ -237 +238 @@
     def getNPages(self):
         pass
+
+""" MetadataFossil created for use with iCal serialisation of Collaboration /
+    VideoService events.
+"""
+class ICollaborationMetadataFossil(IFossil):
+
+    def getStartDateAsString(self):
+        pass
+
+    def getAcceptRejectStatus(self):
+        pass
+    getAcceptRejectStatus.produce = lambda s: 'Pending' if s.getAcceptRejectStatus() is None else 'Accepted'
+    getAcceptRejectStatus.name = 'status'
+
+    def getStartDate(self):
+        pass
+
+    def getEndDate(self):
+        pass
+
+    def _getTitle(self):
+        pass
+
+    _getTitle.produce = lambda s: Collaboration.collaborationTools.CollaborationTools.getBookingTitle(s.getLinkObject() if s.hasSessionOrContributionLink() else s._conf)
+    _getTitle.name = 'title'
+
+    def getType(self):
+        pass
+
+    def getUniqueId(self):
+        pass
+
+    def getURL(self):
+        pass
+    getURL.produce = lambda s: Collaboration.collaborationTools.CollaborationTools.getConferenceOrContributionURL(s)
+    getURL.name = 'url'

indico/MaKaC/plugins/Collaboration/http_api.py

@@ -28 +28 @@
 from MaKaC.common.indexes import IndexesHolder
 from MaKaC.plugins.Collaboration.RecordingManager.common import createIndicoLink
-from MaKaC.plugins.Collaboration.pages import WElectronicAgreement
 from MaKaC.plugins.Collaboration.collaborationTools import CollaborationTools
 from MaKaC.conference import ConferenceHolder
 from MaKaC.plugins.Collaboration.base import SpeakerStatusEnum
+from MaKaC.plugins.Collaboration.fossils import ICollaborationMetadataFossil
 
 
@@ -49 +49 @@
 
     def _getParams(self):
-        # import pydevd; pydevd.settrace(stdoutToServer = True, stderrToServer = True)
-        
+
         super(CollaborationAPIHook, self)._getParams()
         self._indicoID = get_query_parameter(self._queryParams, ['iid', 'indicoID'])
@@ -105 +104 @@
                 }
 
-""" Container for utilitarian tools for use with the Collaboration export API
-"""
-class CollaborationAPIUtils():
-
-    """ The CSBooking object which can be passed through to the fossil
-        may be linked to a Contribution, in the case of WebcastRequest etc,
-        therefore the URL may be more specific than the event in this instance.
-    """
-    @staticmethod
-    def getConferenceOrContributionURL(event):
-        from MaKaC.conference import Conference, Contribution
-        from MaKaC.webinterface.urlHandlers import UHConferenceDisplay, UHContributionDisplay
-        url = ""
-
-        # Webcast and Recording Request specific:
-        if hasattr(event, '_conf'):
-            event = event._conf
-
-        if isinstance(event, Conference):
-            url = UHConferenceDisplay.getURL(event)
-        elif isinstance(event, Contribution):
-            url = UHContributionDisplay(event)
-
-        return url
-
-    @staticmethod
-    def getBookingTitle(booking):
-        title = ""
-        if hasattr(booking, 'getTitle'):
-            title = booking.getTitle()
-        elif hasattr(booking, '_getTitle'):
-            title = booking._getTitle()
-        elif hasattr(booking, '_conf'):
-            title = booking._conf.getTitle()
-
-        return title if title is not None else 'No title defined.'
-
-""" MetadataFossil created for use with iCal serialisation of Collaboration /
-    VideoService events.
-"""
-class ICollaborationMetadataFossil(IFossil):
-
-    def getStartDateAsString(self):
-        pass
-
-    def getAcceptRejectStatus(self):
-        pass
-    getAcceptRejectStatus.produce = lambda s: 'Pending' if s is None else 'Accepted'
-    getAcceptRejectStatus.name = 'status'
-
-    def getStartDate(self):
-        pass
-
-    def getEndDate(self):
-        pass
-
-    def _getTitle(self):
-        pass
-    _getTitle.produce = lambda s: CollaborationAPIUtils.getBookingTitle(s._conf)
-    _getTitle.name = 'title'
-
-    def getType(self):
-        pass
-
-    def getUniqueId(self):
-        pass
-
-    def getURL(self):
-        pass
-    getURL.produce = lambda s: CollaborationAPIUtils.getConferenceOrContributionURL(s)
-    getURL.name = 'url'
 
 """ This has been defined as a separate hook to CollaborationExportHook et al
@@ -241 +169 @@
 
         for id in idList:
-            tempBookings = idx.getBookings(self.ID_TO_IDX[id], "conferenceStartDate", 
+            tempBookings = idx.getBookings(self.ID_TO_IDX[id], "conferenceStartDate",
                                            self._orderBy, self._fromDT, self._toDT,
                                            'UTC', False, None, None, False, dateFormat)
@@ -275 +203 @@
                         else: # contributions is the list of all to be exported now
                             for contrib in contributions:
-                                bk.setStartDate(contrib.getStartDate())
-                                bk.setEndDate(contrib.getEndDate())
+                                if contrib.isScheduled():
+                                    bk.setStartDate(contrib.getStartDate())
+                                    bk.setEndDate(contrib.getEndDate())
+                                else:
+                                    bk.setStartDate(bk._conf.getStartDate())
+                                    bk.setEndDate(bk._conf.getEndDate())
                                 yield bk
 

indico/web/http_api/api.py

@@ -521 +521 @@
         return self._process(_iterate_objs(idlist))
 
-
 Serializer.register('html', HTML4Serializer)
 Serializer.register('jsonp', JSONPSerializer)

indico/web/http_api/fossils.py

@@ -321 +321 @@
     getContributionListWithoutSessions.result = IContributionMetadataWithSubContribsFossil
     getContributionListWithoutSessions.name = 'contributions'
-
-
-
-

indico/web/http_api/ical.py

@@ -137 +137 @@
         cal.set('version', '2.0')
         cal.set('prodid', '-//CERN//INDICO//EN')
-
         now = datetime.datetime.utcnow()
         for fossil in results: