lucaspalomodevelop/indico-plugins
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/indico-plugins.git synced 2026-03-19 18:24:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use new users.merged signal

Browse Source
This commit is contained in:
Adrian Moennich 2015-05-11 13:37:56 +02:00
parent 74d15a6ff6
commit 463b4c8fa9
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
chat/indico_chat/plugin.py
View File

@ -101,7 +101,7 @@ class ChatPlugin(IndicoPlugin):
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.connect(signals.merge_users, self._merge_users)
self.connect(signals.users.merged, self._merge_users)
self.template_hook('event-header', self.inject_event_header)
self.inject_css('chat_css', WPChatEventMgmt)
self.inject_js('chat_js', WPChatEventMgmt)
@ -162,10 +162,8 @@ class ChatPlugin(IndicoPlugin):
chatroom_deleted = event_chatroom.delete()
notify_deleted(event_chatroom.chatroom, event, None, chatroom_deleted)
def _merge_users(self, user, merged, **kwargs):
new_id = int(user.id)
old_id = int(merged.id)
self.settings.set('admins', principals_merge_users(self.settings.get('admins'), new_id, old_id))
def _merge_users(self, target, source, **kwargs):
self.settings.set('admins', principals_merge_users(self.settings.get('admins'), target.id, source.id))
class ChatroomCloner(EventCloner):

6
vc_vidyo/indico_vc_vidyo/plugin.py
View File

@ -330,10 +330,8 @@ class VidyoPlugin(VCPluginMixin, IndicoPlugin):
def can_manage_vc_room(self, user, room):
return user == room.vidyo_extension.owned_by_user or super(VidyoPlugin, self).can_manage_vc_room(user, room)
def _merge_users(self, user, merged, **kwargs):
super(VidyoPlugin, self)._merge_users(user, merged, **kwargs)
target = user.user
source = merged.user
def _merge_users(self, target, source, **kwargs):
super(VidyoPlugin, self)._merge_users(target, source, **kwargs)
for ext in VidyoExtension.find(owned_by_user=source):
ext.owned_by_user = target
flag_modified(ext.vc_room, 'data')