Changeset cbf814 in indico


Ignore:
Timestamp:
12/03/09 11:39:10 (3 years ago)
Author:
Pedro Ferreira <jose.pedro.ferreira@…>
Branches:
master, burotel, hello-world-walkthrough, ipv6, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1
Children:
e3634a
Parents:
99ebd7
git-author:
Cvetelina Angelova <csvetelina.angelova@…> (11/26/09 11:14:13)
git-committer:
Pedro Ferreira <jose.pedro.ferreira@…> (12/03/09 11:39:10)
Message:

[FIXED] - edit material popup + display subcontr

  • fixes #61 - Subcontribution Display was giving an exception;
  • fixes #41 - "Edit" material popup was not working for Display contribution, also for Management Category; the close Button in the popup now works; the popup size is fixed(before the Allowed users div was not fitting well)
Location:
indico
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    rf25f07 rcbf814  
    330330            else: 
    331331                raise ServiceAccessError("ERR-P5", "You don't have the rights to modify this object") 
    332         if hasattr(self._target, "getConference"): 
     332        if hasattr(self._target, "getConference") and hasattr(self._target, "isClosed"): 
    333333            if target.getConference().isClosed(): 
    334334                raise ServiceAccessError("ERR-P6", "Conference %s is closed"%target.getConference().getId()) 

  • indico/MaKaC/webinterface/pages/category.py

    r09061d rcbf814  
    21482148    def getJSFiles(self): 
    21492149        return WPCategoryModifBase.getJSFiles(self) + \ 
     2150               self._includeJSPackage('Management') + \ 
    21502151               self._includeJSPackage('MaterialEditor') 
    21512152 

  • indico/MaKaC/webinterface/pages/contributions.py

    re99586 rcbf814  
    5454    def getJSFiles(self): 
    5555        return WPConferenceDefaultDisplayBase.getJSFiles(self) + \ 
     56            self._includeJSPackage('Management') + \ 
    5657               self._includeJSPackage('MaterialEditor') 
    5758 

  • indico/MaKaC/webinterface/pages/subContributions.py

    r9033fd rcbf814  
    2626import MaKaC.webinterface.navigation as navigation 
    2727import MaKaC.webinterface.linking as linking 
     28from MaKaC.webinterface.pages.main import WPMainBase 
    2829from MaKaC.webinterface.common.person_titles import TitlesRegistry 
    2930from xml.sax.saxutils import quoteattr 
    … …  
    3435from MaKaC.i18n import _ 
    3536 
    36 class WPSubContributionBase( WPConferenceBase ): 
     37class WPSubContributionBase( WPMainBase, WPConferenceBase ): 
    3738     
    3839    def __init__( self, rh, subContribution ): 
    … …  
    5556 
    5657 
    57 class WPSubContributionDisplayBase( WPSubContributionBase ): 
    58     pass 
    59  
    60  
    61 class WPSubContributionDefaultDisplayBase( WPSubContributionDisplayBase, WPConferenceDefaultDisplayBase ): 
    62      
     58class WPSubContributionDefaultDisplayBase( WPConferenceDefaultDisplayBase, WPSubContributionBase ): 
     59     
     60    def getJSFiles(self): 
     61        return WPConferenceDefaultDisplayBase.getJSFiles(self) + \ 
     62            self._includeJSPackage('Management') + \ 
     63               self._includeJSPackage('MaterialEditor') 
     64 
    6365    def __init__( self, rh, contribution ): 
    64         WPSubContributionDisplayBase.__init__( self, rh, contribution ) 
    65          
    66     def _getHeader( self ): 
    67         return WPConferenceDefaultDisplayBase._getHeader( self ) 
    68  
    69     def _applyDecoration( self, body ): 
    70         return WPConferenceDefaultDisplayBase._applyDecoration( self, body ) 
    71  
    72     def _display(self,params): 
    73         return WPConferenceDefaultDisplayBase._display(self,params) 
     66        WPSubContributionBase.__init__( self, rh, contribution ) 
     67 
     68 
     69 
    7470 
    7571class WSubContributionDisplayBase(wcomponents.WTemplated): 

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

    r9033fd rcbf814  
    134134 
    135135class RHSubmitMaterial(RHSubContributionDisplayBase): 
    136     _uh=urlHandlers.UHSubContribSubmitMaterial 
    137136 
    138137    def _checkProtection(self): 

  • indico/htdocs/js/indico/Core/Dialogs/Popup.js

    rd49d86 rcbf814  
    186186         // Called when user clicks the close button, if the function 
    187187         // returns true the dialog will be closed. 
    188          this.closeHandler = any(closeButtonHandler, null); 
     188         this.closeHandler = any(closeButtonHandler, function() {return true; }); 
    189189 
    190190         // The maximum allowed height, used since it doesn't look 

  • indico/htdocs/js/indico/MaterialEditor/Editor.js

    r5c6a93 rcbf814  
    395395        $B(url, self.newResource.accessor('url')); 
    396396 
    397         self.userList = new UserListField('ShortPeopleListDiv', 
     397        self.userList = new UserListField('VeryShortPeopleListDiv', 
    398398                                          'PluginPeopleList', 
    399399                                          self.allowedUsers, 
Note: See TracChangeset for help on using the changeset viewer.