Changeset 0e0c28 in indico

Timestamp:

12/03/09 18:37:08 (4 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

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, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

df3d1f

Parents:

5db6c7

Message:

[FIXED] Webcast admins access

fixes #78: Webcast admins should have access rights to every event
fixes #79: Webcast admins should see the "Video Services Overview"

Location:

indico/MaKaC

Files:

• services/implementation/collaboration.py (modified) (1 diff)
• webinterface/pages/collaboration.py (modified) (1 diff)
• webinterface/rh/collaboration.py (modified) (3 diffs)
• webinterface/rh/conferenceDisplay.py (modified) (1 diff)
• webinterface/wcomponents.py (modified) (1 diff)

indico/MaKaC/services/implementation/collaboration.py

@@ -237 +237 @@
     """
     """
+    
+    def _checkProtection(self):
+        if not RCCollaborationPluginAdmin.hasRights(self, None, "any"):
+            AdminCollaborationBase._checkProtection(self)
+            
     def _checkParams(self):
         AdminCollaborationBase._checkParams(self)

indico/MaKaC/webinterface/pages/collaboration.py

@@ -374 +374 @@
             if b.canBeStarted():
                 ongoingBookings.append(b)
-            if b.getAdjustedStartDate('UTC') > nowutc():
+            if b.getStartDate() and b.getAdjustedStartDate('UTC') > nowutc():
                 scheduledBookings.setdefault(b.getAdjustedStartDate(self._tz).date(), []).append(b)
                 

indico/MaKaC/webinterface/rh/collaboration.py

@@ -59 +59 @@
         """ Returns True if the user is an admin of one of the plugins corresponding to pluginNames
             plugins: a list of Plugin objects (e.g. EVO, RecordingRequest) or strings with the plugin name ('EVO', 'RecordingRequest')
+                     or the string 'any' (we will then check if the user is manager of any plugin),
         """
         if not PluginsHolder().hasPluginType("Collaboration"):
@@ -70 +71 @@
         
         coll = PluginsHolder().getPluginType('Collaboration')
+        
+        if plugins == 'any':
+            plugins = []
+            for p in CollaborationTools.getCollaborationPluginType().getPluginList():
+                plugins.append(p.getName())
         
         if plugins:
@@ -142 +148 @@
         if not PluginsHolder().hasPluginType("Collaboration"):
             raise PluginError("Collaboration plugin system is not active")
-        if not RCCollaborationAdmin.hasRights(self, None): #and not RCCollaborationPluginAdmin.hasRights(self, None, self._tabPlugins)
+        
+        if not RCCollaborationAdmin.hasRights(self, None) and not RCCollaborationPluginAdmin.hasRights(self, plugins = "any"): #RCCollaborationPluginAdmin.hasRights(self, None, self._tabPlugins):
             RHAdminBase._checkProtection(self)
             

indico/MaKaC/webinterface/rh/conferenceDisplay.py

@@ -392 +392 @@
 
     def _checkProtection( self ):
-        RHDisplayBaseProtected._checkProtection( self )
+        from MaKaC.webinterface.rh.collaboration import RCCollaborationAdmin, RCCollaborationPluginAdmin
+        if not RCCollaborationAdmin.hasRights(self, None) and \
+            not RCCollaborationPluginAdmin.hasRights(self, plugins = "any"): 
+            RHDisplayBaseProtected._checkProtection( self )
 
 

indico/MaKaC/webinterface/wcomponents.py

@@ -365 +365 @@
                 adminItemList.append({'url': urlHandlers.UHAdminArea.getURL(), 'text': _("Server admin")})
             if PluginsHolder().hasPluginType("Collaboration"):
-                from MaKaC.webinterface.rh.collaboration import RCCollaborationAdmin
-                if (self._currentuser.isAdmin() or RCCollaborationAdmin.hasRights(user = self._currentuser)) and CollaborationTools.anyPluginsAreActive():
+                from MaKaC.webinterface.rh.collaboration import RCCollaborationAdmin, RCCollaborationPluginAdmin
+                if (self._currentuser.isAdmin() or RCCollaborationAdmin.hasRights(user = self._currentuser) or RCCollaborationPluginAdmin.hasRights(user = self._currentuser, plugins = "any")) and CollaborationTools.anyPluginsAreActive():
                     adminItemList.append({'url': urlHandlers.UHAdminCollaboration.getURL(), 'text': _("Video Services Overview")})
             if webcast.HelperWebcastManager.getWebcastManagerInstance().isManager(self._currentuser):