Changeset ee3e75 in indico


Ignore:
Timestamp:
03/14/11 16:43:33 (2 years ago)
Author:
Jose Benito <jose.benito.gonzalez@…>
Branches:
master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72
Children:
136ed9a
Parents:
d0e066
git-author:
Adrian Moennich <jerome.ernst.monnich@…> (03/14/11 16:44:13)
git-committer:
Jose Benito <jose.benito.gonzalez@…> (03/14/11 16:43:33)
Message:

[FIX] Errors caused by adding req argument to service RH

  • remove some useless constructors
  • accept and pass req argument from ServiceBase? subclasses
Location:
indico/MaKaC
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • indico/MaKaC/plugins/InstantMessaging/XMPP/handlers.py

    r010517 ree3e75  
    5353                 } 
    5454 
    55     def __init__(self, params, remoteHost, session): 
    56         ChatroomServiceBase.__init__(self, params, remoteHost, session) 
     55    def __init__(self, params, remoteHost, session, req): 
     56        ChatroomServiceBase.__init__(self, params, remoteHost, session, req) 
    5757        #we want the data from the XMPP plugin in the InstantMessaging Plugin type 
    5858        oh = PluginFieldsWrapper('InstantMessaging', 'XMPP') 
    … …  
    153153class CreateChatroom( XMPPChatroomService ): 
    154154 
    155     def __init__(self, params, remoteHost, session): 
    156         XMPPChatroomService.__init__(self, params, remoteHost, session) 
    157  
    158155    def _checkParams(self): 
    159156        XMPPChatroomService._checkParams(self) 
    … …  
    211208class EditChatroom( XMPPChatroomService ): 
    212209 
    213     def __init__(self, params, remoteHost, session): 
    214         XMPPChatroomService.__init__(self, params, remoteHost, session) 
    215  
    216210    def _checkParams(self): 
    217211        XMPPChatroomService._checkParams(self) 
    … …  
    294288class DeleteChatroom( XMPPChatroomService ): 
    295289 
    296     def __init__(self, params, remoteHost, session): 
    297         XMPPChatroomService.__init__(self, params, remoteHost, session) 
    298  
    299290    def _checkParams(self): 
    300291        XMPPChatroomService._checkParams(self) 
    … …  
    332323class GetRoomPreferences( XMPPChatroomService ): 
    333324 
    334     def __init__(self, params, remoteHost, session): 
    335         XMPPChatroomService.__init__(self, params, remoteHost, session) 
    336  
    337325    def _checkParams(self): 
    338326        XMPPChatroomService._checkParams(self) 
    … …  
    364352class GetRoomsByUser( ServiceBase ): 
    365353 
    366     def __init__(self, params, remoteHost, session): 
    367         ServiceBase.__init__(self, params, remoteHost, session) 
    368  
    369354    def _checkParams(self): 
    370355        self._user = self._params['usr'] 
    … …  
    376361 
    377362class AddConference2Room( ServiceBase, Observable ): 
    378  
    379     def __init__(self, params, remoteHost, session): 
    380         ServiceBase.__init__(self, params, remoteHost, session) 
    381363 
    382364    def _checkParams(self): 
    … …  
    412394class AddLogs2Material( ServiceBase ): 
    413395 
    414     def __init__(self, params, remoteHost, session): 
    415         ServiceBase.__init__(self, params, remoteHost, session) 
    416  
    417396    def _checkParams(self): 
    418397        self._conf = ConferenceHolder().getById(self._params['confId']) 

  • indico/MaKaC/plugins/InstantMessaging/handlers.py

    rf7f228 ree3e75  
    2727class ChatroomServiceBase ( ProtectedModificationService, Observable ): 
    2828 
    29     def __init__(self, params, remoteHost, session): 
    30         ProtectedModificationService.__init__(self, params, remoteHost, session) 
     29    def __init__(self, params, remoteHost, session, req): 
     30        ProtectedModificationService.__init__(self, params, remoteHost, session, req) 
    3131 
    3232    def _checkParams(self): 

  • indico/MaKaC/services/implementation/base.py

    rd0e066 ree3e75  
    3535    ResultWithWarning 
    3636 
    37 from MaKaC.webinterface.rh.base import RequestHandlerBase, RH 
     37from MaKaC.webinterface.rh.base import RequestHandlerBase 
    3838from MaKaC.webinterface.mail import GenericMailer, GenericNotification 
    3939 
Note: See TracChangeset for help on using the changeset viewer.