Changeset 939a69 in indico for indico/MaKaC/webinterface/wcomponents.py

Timestamp:

03/03/10 18:53:11 (3 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, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 4c7d4152dff271ba5df5a8606605969cab454080

Children:

d66f12

Parents:

921f9f

git-author:

David Martín Clavo <david.martin.clavo@…> (02/12/10 16:23:25)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (03/03/10 18:53:11)

Message:

[FIX] Several minor Collaboration fixes

-Removed global Collaboration imports
-Redirect unlogged users to login page in some
cases where they were not.
-Redirect Video Services Admins to VideoServices?
tab if they are not Server Admins or Event Managers.
-Bug in display page of event if plugin is
deactivated after a booking of that plugin has been made.
-Missing default CSBooking._hasTitle
-Missing default CSBooking._complexParameters (so
that pylint does not complain).

-fixes #169

File:

• indico/MaKaC/webinterface/wcomponents.py (modified) (2 diffs)

indico/MaKaC/webinterface/wcomponents.py

@@ -21 +21 @@
 
 from MaKaC.plugins.base import PluginsHolder
-from MaKaC.plugins.Collaboration.collaborationTools import CollaborationTools
 
 import os,types,string
@@ -369 +368 @@
             if PluginsHolder().hasPluginType("Collaboration"):
                 from MaKaC.webinterface.rh.collaboration import RCCollaborationAdmin, RCCollaborationPluginAdmin
+                from MaKaC.plugins.Collaboration.collaborationTools import CollaborationTools
                 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")})