paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

events: Migrate client_type => client_type_name in marshalling code.

Browse Source
This commit is contained in:
Tim Abbott
2016-01-27 08:04:38 -08:00
parent d936bf61f9
commit 6cd14af18f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/lib/event_queue.py
View File

@@ -88,7 +88,7 @@ class ClientDescriptor(object):
apply_markdown=self.apply_markdown,
all_public_streams=self.all_public_streams,
narrow=self.narrow,
client_type=self.client_type_name)
client_type_name=self.client_type_name)
def __repr__(self):
return "ClientDescriptor<%s>" % (self.event_queue.id,)
@@ -99,9 +99,12 @@ class ClientDescriptor(object):
# Temporary migration for the addition of the new user_profile_email field
from zerver.models import get_user_profile_by_id
d['user_profile_email'] = get_user_profile_by_id(d['user_profile_id']).email
if 'client_type' in d:
# Temporary migration for the rename of client_type to client_type_name
d['client_type_name'] = d['client_type']
ret = cls(d['user_profile_id'], d['user_profile_email'], d['realm_id'],
EventQueue.from_dict(d['event_queue']), d['event_types'],
d['client_type'], d['apply_markdown'], d['all_public_streams'],
d['client_type_name'], d['apply_markdown'], d['all_public_streams'],
d['queue_timeout'], d.get('narrow', []))
ret.last_connection_time = d['last_connection_time']
return ret