Changeset 31e017 in indico


Ignore:
Timestamp:
04/02/12 16:26:48 (14 months ago)
Author:
Jose Benito <jose.benito.gonzalez@…>
Branches:
master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72
Children:
e2a398
Parents:
316de4
Message:

[REF] Replaced session2ical and contrib2ical with httpapi

Location:
indico
Files:
3 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • indico/MaKaC/webinterface/rh/categoryDisplay.py

    r316de4 r31e017  
    539539 
    540540    def _process( self ): 
    541         filename = "%s - Categ.ics"%self._target.getName().replace("/","") 
     541        filename = "%s-Categ.ics"%self._target.getName().replace("/","") 
    542542 
    543543        hook = CategoryEventHook({}, 'categ', {'idlist':self._target.getId(), 'dformat': 'ics'}) 

  • indico/MaKaC/webinterface/rh/conferenceDisplay.py

    r0025fd r31e017  
    10841084 
    10851085    def _process( self ): 
    1086         filename = "%s - Event.ics"%cleanHTMLHeaderFilename(self._target.getTitle()) 
     1086        filename = "%s-Event.ics"%cleanHTMLHeaderFilename(self._target.getTitle()) 
    10871087 
    10881088        hook = CategoryEventHook({'detail':[self._detailLevel]}, 'event', {'idlist':self._conf.getId(), 'dformat': 'ics'}) 

  • indico/MaKaC/webinterface/rh/contribDisplay.py

    r250e54 r31e017  
    2222import sys 
    2323 
    24 import MaKaC.conference as conference 
    2524import MaKaC.webinterface.pages.contributions as contributions 
    2625import MaKaC.webinterface.urlHandlers as urlHandlers 
    2726from MaKaC.webinterface.rh.base import RHDisplayBaseProtected,\ 
    2827    RoomBookingDBMixin 
    29 from MaKaC.webinterface.rh.conferenceBase import RHContributionBase, RHSubmitMaterialBase 
     28from MaKaC.webinterface.rh.conferenceBase import RHContributionBase 
    3029from MaKaC.PDFinterface.conference import ContribToPDF 
    31 from MaKaC.ICALinterface.conference import ContribToiCal 
    3230from MaKaC.common.xmlGen import XMLGen 
    3331from MaKaC.common import Config 
    … …  
    3634import MaKaC.webinterface.materialFactories as materialFactories 
    3735from MaKaC.i18n import _ 
     36from indico.web.http_api.api import ContributionHook 
     37from indico.util.metadata.serializer import Serializer 
    3838 
    3939 
    … …  
    118118 
    119119    def _process( self ): 
    120         filename = "%s - Contribution.ics"%self._target.getTitle() 
    121         ical = ContribToiCal(self._target.getConference(), self._target) 
    122         data = ical.getBody() 
     120        filename = "%s-Contribution.ics"%self._target.getTitle() 
     121 
     122        hook = ContributionHook({}, 'contribution', {'event': self._conf.getId(), 'idlist':self._contrib.getId(), 'dformat': 'ics'}) 
     123        res = hook(self.getAW(), self._req) 
     124        resultFossil = {'results': res[0]} 
     125 
     126        serializer = Serializer.create('ics') 
     127        data = serializer(resultFossil) 
     128 
    123129        self._req.headers_out["Content-Length"] = "%s"%len(data) 
    124130        cfg = Config.getInstance() 

  • indico/MaKaC/webinterface/rh/services.py

    r4a686c r31e017  
    2222import MaKaC.webinterface.urlHandlers as urlHandlers 
    2323from MaKaC.common.general import * 
    24 from MaKaC.common import Config 
    2524from MaKaC.common import utils 
    2625from MaKaC.common import info 
    27 import MaKaC.user as user 
    2826import MaKaC.webcast as webcast 
    2927from MaKaC.errors import WebcastAdminError 
    … …  
    3129from MaKaC.webinterface.pages import admins as adminPages 
    3230from MaKaC.webinterface.rh.base import RHProtected 
    33 from MaKaC.webinterface.rh.conferenceBase import RHConferenceBase 
    34 from MaKaC.webinterface.pages import conferences 
    3531from MaKaC.errors import MaKaCError 
    36 from MaKaC.ICALinterface.conference import WebcastToiCal 
    3732 
    3833class RHServicesBase(admins.RHAdminBase): 
    … …  
    6964        p = adminPages.WPWebcast(self) 
    7065        return p.display() 
    71  
    72 class RHWebcastICal( RHWebcastBase ): 
    73     """ ICal export of all webcasted events 
    74     the link is public so all webcasted events are supposed 
    75     to be public """ 
    76     _uh = urlHandlers.UHWebcast 
    77  
    78     def _checkProtection( self ): 
    79         self._wm = webcast.HelperWebcastManager.getWebcastManagerInstance() 
    80  
    81     def _checkParams( self, params ): 
    82         admins.RHAdminBase._checkParams( self, params ) 
    83         self._params = params 
    84  
    85     def _process( self ): 
    86         filename = "Webcast - Event.ics" 
    87         data = "" 
    88         data += WebcastToiCal(self._wm).getBody() 
    89         self._req.headers_out["Content-Length"] = "%s"%len(data) 
    90         cfg = Config.getInstance() 
    91         mimetype = cfg.getFileTypeMimeType( "ICAL" ) 
    92         self._req.content_type = """%s"""%(mimetype) 
    93         self._req.headers_out["Content-Disposition"] = """inline; filename="%s\""""%filename 
    94         return data 
    9566 
    9667class RHWebcastArchive( RHWebcastBase ): 

  • indico/MaKaC/webinterface/rh/sessionDisplay.py

    r250e54 r31e017  
    2929from MaKaC.ICALinterface.conference import SessionToiCal 
    3030from MaKaC.common import Config 
     31from indico.web.http_api.api import SessionHook 
     32from indico.util.metadata.serializer import Serializer 
    3133 
    3234 
    … …  
    6264 
    6365    def _process( self ): 
    64         filename = "%s - Session.ics"%self._session.getTitle() 
    65         ical = SessionToiCal(self._session.getConference(), self._session) 
    66         data = ical.getBody() 
     66        filename = "%s-Session.ics"%self._session.getTitle() 
     67 
     68        hook = SessionHook({}, 'session', {'event': self._conf.getId(), 'idlist':self._session.getId(), 'dformat': 'ics'}) 
     69        res = hook(self.getAW(), self._req) 
     70        resultFossil = {'results': res[0]} 
     71 
     72        serializer = Serializer.create('ics') 
     73        data = serializer(resultFossil) 
     74 
    6775        self._req.headers_out["Content-Length"] = "%s"%len(data) 
    6876        cfg = Config.getInstance() 

  • indico/MaKaC/webinterface/urlHandlers.py

    r316de4 r31e017  
    30273027class UHWebcast( URLHandler ): 
    30283028    _relativeURL = "adminServices.py/webcast" 
    3029  
    3030 class UHWebcastICal( URLHandler ): 
    3031     _relativeURL = "adminServices.py/webcastICal" 
    30323029 
    30333030class UHWebcastArchive( URLHandler ): 

  • indico/htdocs/adminServices.py

    r4a686c r31e017  
    2424def webcast(req, **params): 
    2525    return services.RHWebcast(req).process(params) 
    26  
    27 def webcastICal(req, **params): 
    28     return services.RHWebcastICal(req).process(params) 
    2926 
    3027def webcastArchive(req, **params): 

  • indico/web/http_api/fossils.py

    r962919 r31e017  
    328328    getContributionList.result = IContributionMetadataFossil 
    329329    getContributionList.name = 'contributions' 
     330    getContributionList.filterBy = 'access' 
    330331 
    331332class ISessionMetadataWithSubContribsFossil(ISessionFossil): 
    … …  
    335336    getContributionList.result = IContributionMetadataWithSubContribsFossil 
    336337    getContributionList.name = 'subcontributions' 
     338    getContributionList.filterBy = 'access' 
    337339 
    338340class IConferenceMetadataWithSessionsFossil(_IncludeMaterialFossil, IConferenceMetadataFossil): 

  • indico/web/http_api/ical.py

    r422854 r31e017  
    138138        'conferenceMetadataWithContribs': serialize_contribs, 
    139139        'sessionMetadata': serialize_contribs, 
     140        'sessionMetadataWithContributions': serialize_contribs, 
    140141        'contributionMetadata': serialize_contrib 
    141142    } 
Note: See TracChangeset for help on using the changeset viewer.