From b330b3d3679f7ada3fdbe61ceba69a2ea28f19c1 Mon Sep 17 00:00:00 2001 From: Adrian Moennich Date: Thu, 20 Nov 2014 16:26:22 +0100 Subject: [PATCH] Use new signal namespaces --- chat/indico_chat/plugin.py | 10 ++--- importer/indico_importer/plugin.py | 2 +- livesync/indico_livesync/handler.py | 58 ++++++++++++++--------------- piwik/indico_piwik/plugin.py | 4 +- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/chat/indico_chat/plugin.py b/chat/indico_chat/plugin.py index 717673b..abfce85 100644 --- a/chat/indico_chat/plugin.py +++ b/chat/indico_chat/plugin.py @@ -98,11 +98,11 @@ class ChatPlugin(IndicoPlugin): def init(self): super(ChatPlugin, self).init() self.connect(signals.indico_help, self.extend_indico_help) - self.connect(signals.event_sidemenu, self.extend_event_menu) - self.connect(signals.event_management_sidemenu, self.extend_event_management_menu) - self.connect(signals.event_management_clone, self.extend_event_management_clone) - self.connect(signals.event_deleted, self.event_deleted) - self.connect(signals.event_management_url, self.get_event_management_url) + self.connect(signals.event.sidemenu, self.extend_event_menu) + self.connect(signals.event.deleted, self.event_deleted) + self.connect(signals.event_management.sidemenu, self.extend_event_management_menu) + self.connect(signals.event_management.clone, self.extend_event_management_clone) + self.connect(signals.event_management.management_url, self.get_event_management_url) self.template_hook('event-header', self.inject_event_header) for wp in (WPTPLConferenceDisplay, WPXSLConferenceDisplay, WPChatEventPage, WPChatEventMgmt): self.inject_css('chat_css', wp) diff --git a/importer/indico_importer/plugin.py b/importer/indico_importer/plugin.py index 9d4baf0..a354eb4 100644 --- a/importer/indico_importer/plugin.py +++ b/importer/indico_importer/plugin.py @@ -37,7 +37,7 @@ class ImporterPlugin(IndicoPlugin): super(ImporterPlugin, self).init() self.inject_js('importer_js', WPConfModifScheduleGraphic) self.inject_css('importer_css', WPConfModifScheduleGraphic) - self.connect(signals.timetable_buttons, self.get_timetable_buttons) + self.connect(signals.event.timetable_buttons, self.get_timetable_buttons) self.importer_engines = {} def get_blueprints(self): diff --git a/livesync/indico_livesync/handler.py b/livesync/indico_livesync/handler.py index ce76838..a1e62a3 100644 --- a/livesync/indico_livesync/handler.py +++ b/livesync/indico_livesync/handler.py @@ -33,42 +33,42 @@ def connect_signals(plugin): plugin.connect(signals.after_process, _apply_changes) plugin.connect(signals.before_retry, _clear_changes) # moved - plugin.connect(signals.category_moved, _moved) - plugin.connect(signals.event_moved, _moved) + plugin.connect(signals.category.moved, _moved) + plugin.connect(signals.event.moved, _moved) # created - plugin.connect(signals.category_created, _created) - plugin.connect(signals.event_created, _created) - plugin.connect(signals.contribution_created, _created) - plugin.connect(signals.subcontribution_created, _created) + plugin.connect(signals.category.created, _created) + plugin.connect(signals.event.created, _created) + plugin.connect(signals.event.contribution_created, _created) + plugin.connect(signals.event.subcontribution_created, _created) # deleted - plugin.connect(signals.category_deleted, _deleted) - plugin.connect(signals.event_deleted, _deleted) - plugin.connect(signals.contribution_deleted, _deleted) - plugin.connect(signals.subcontribution_deleted, _deleted) + plugin.connect(signals.category.deleted, _deleted) + plugin.connect(signals.event.deleted, _deleted) + plugin.connect(signals.event.contribution_deleted, _deleted) + plugin.connect(signals.event.subcontribution_deleted, _deleted) # title - plugin.connect(signals.category_title_changed, _title_changed) - plugin.connect(signals.event_data_changed, _title_changed) - plugin.connect(signals.contribution_title_changed, _title_changed) - plugin.connect(signals.subcontribution_title_changed, _title_changed) + plugin.connect(signals.category.title_changed, _title_changed) + plugin.connect(signals.event.data_changed, _title_changed) + plugin.connect(signals.event.contribution_title_changed, _title_changed) + plugin.connect(signals.event.subcontribution_title_changed, _title_changed) # data - plugin.connect(signals.category_data_changed, _data_changed) - plugin.connect(signals.event_data_changed, _data_changed) - plugin.connect(signals.contribution_data_changed, _data_changed) - plugin.connect(signals.subcontribution_data_changed, _data_changed) + plugin.connect(signals.category.data_changed, _data_changed) + plugin.connect(signals.event.data_changed, _data_changed) + plugin.connect(signals.event.contribution_data_changed, _data_changed) + plugin.connect(signals.event.subcontribution_data_changed, _data_changed) # protection - plugin.connect(signals.category_protection_changed, _protection_changed) - plugin.connect(signals.event_protection_changed, _protection_changed) - plugin.connect(signals.contribution_protection_changed, _protection_changed) + plugin.connect(signals.category.protection_changed, _protection_changed) + plugin.connect(signals.event.protection_changed, _protection_changed) + plugin.connect(signals.event.contribution_protection_changed, _protection_changed) # ACLs - plugin.connect(signals.access_granted, _acl_changed) - plugin.connect(signals.access_revoked, _acl_changed) - plugin.connect(signals.modification_granted, _acl_changed) - plugin.connect(signals.modification_revoked, _acl_changed) + plugin.connect(signals.acl.access_granted, _acl_changed) + plugin.connect(signals.acl.access_revoked, _acl_changed) + plugin.connect(signals.acl.modification_granted, _acl_changed) + plugin.connect(signals.acl.modification_revoked, _acl_changed) # domain access - plugin.connect(signals.category_domain_access_granted, _domain_changed) - plugin.connect(signals.category_domain_access_revoked, _domain_changed) - plugin.connect(signals.event_domain_access_granted, _domain_changed) - plugin.connect(signals.event_domain_access_revoked, _domain_changed) + plugin.connect(signals.category.domain_access_granted, _domain_changed) + plugin.connect(signals.category.domain_access_revoked, _domain_changed) + plugin.connect(signals.event.domain_access_granted, _domain_changed) + plugin.connect(signals.event.domain_access_revoked, _domain_changed) def _moved(obj, old_parent, new_parent, **kwargs): diff --git a/piwik/indico_piwik/plugin.py b/piwik/indico_piwik/plugin.py index ff6dc80..8e48dd9 100644 --- a/piwik/indico_piwik/plugin.py +++ b/piwik/indico_piwik/plugin.py @@ -56,8 +56,8 @@ class PiwikPlugin(IndicoPlugin): def init(self): super(PiwikPlugin, self).init() - self.connect(signals.event_management_sidemenu, self.add_sidemenu_item) - self.connect(signals.material_downloaded, self.track_download) + self.connect(signals.event_management.sidemenu, self.add_sidemenu_item) + self.connect(signals.event.material_downloaded, self.track_download) self.template_hook('html-head', self.inject_tracking) def inject_tracking(self, template, **kwargs):