From f959995d670cdb4f319653c4de74baaa77c74c71 Mon Sep 17 00:00:00 2001 From: Adrian Moennich Date: Thu, 5 Mar 2015 15:25:19 +0100 Subject: [PATCH] Chat, Piwik, VC/Vidyo: Fix modif key handling canUserAccess doesn't check modification keys --- chat/indico_chat/plugin.py | 2 +- piwik/indico_piwik/plugin.py | 2 +- vc_vidyo/indico_vc_vidyo/templates/buttons.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chat/indico_chat/plugin.py b/chat/indico_chat/plugin.py index 1a953e5..21da71e 100644 --- a/chat/indico_chat/plugin.py +++ b/chat/indico_chat/plugin.py @@ -146,7 +146,7 @@ class ChatPlugin(IndicoPlugin): visible=self._has_visible_chatrooms) def extend_event_management_menu(self, event, **kwargs): - if event.canUserModify(session.user) or is_chat_admin(session.user): + if event.canModify(session.user) or is_chat_admin(session.user): return 'chat-management', SideMenuItem('Chat Rooms', url_for_plugin('chat.manage_rooms', event)) def extend_event_management_clone(self, event, **kwargs): diff --git a/piwik/indico_piwik/plugin.py b/piwik/indico_piwik/plugin.py index 2437a86..705c47b 100644 --- a/piwik/indico_piwik/plugin.py +++ b/piwik/indico_piwik/plugin.py @@ -72,7 +72,7 @@ class PiwikPlugin(IndicoPlugin): **event_tracking_params) def add_sidemenu_item(self, event, **kwargs): - if event.canUserModify(session.user): + if event.canModify(session.user): menu_item = SideMenuItem(_("Statistics"), url_for_plugin('piwik.view', event)) return 'statistics', menu_item diff --git a/vc_vidyo/indico_vc_vidyo/templates/buttons.html b/vc_vidyo/indico_vc_vidyo/templates/buttons.html index b6e39b7..5737150 100644 --- a/vc_vidyo/indico_vc_vidyo/templates/buttons.html +++ b/vc_vidyo/indico_vc_vidyo/templates/buttons.html @@ -1,5 +1,5 @@ {% macro render_make_me_moderator(event, vc_room, event_vc_room) %} - {% if event.canUserModify(session.user) and session.user.id != vc_room.data['owner'][1] %} + {% if event.canModify(session.user) and session.user.id != vc_room.data['owner'][1] %}