Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

import: Fix RealmEmoji import bug. 

RealmEmoji should be imported after UserProfile,
as the new user_profile ids are not allocated
if we import it before.
This commit is contained in:
Rhea Parekh 2018-05-27 00:48:36 +05:30 committed by Tim Abbott
parent 1b7b9a7164
commit 7198cc3899
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zerver/lib/import_realm.py
View File

@ -446,13 +446,6 @@ def do_import_realm(import_dir: Path, subdomain: str) -> Realm:
realm.notifications_stream_id = notifications_stream_id realm.notifications_stream_id = notifications_stream_id
realm.save() realm.save()
re_map_foreign_keys(data, 'zerver_defaultstream', 'stream', related_table="stream")
re_map_foreign_keys(data, 'zerver_realmemoji', 'author', related_table="user_profile")
for (table, model, related_table) in realm_tables:
re_map_foreign_keys(data, table, 'realm', related_table="realm")
update_model_ids(model, data, table, related_table)
bulk_import_model(data, model, table)
# Remap the user IDs for notification_bot and friends to their # Remap the user IDs for notification_bot and friends to their
# appropriate IDs on this server # appropriate IDs on this server
for item in data['zerver_userprofile_crossrealm']: for item in data['zerver_userprofile_crossrealm']:
@ -490,6 +483,13 @@ def do_import_realm(import_dir: Path, subdomain: str) -> Realm:
user_profile.set_unusable_password() user_profile.set_unusable_password()
UserProfile.objects.bulk_create(user_profiles) UserProfile.objects.bulk_create(user_profiles)
re_map_foreign_keys(data, 'zerver_defaultstream', 'stream', related_table="stream")
re_map_foreign_keys(data, 'zerver_realmemoji', 'author', related_table="user_profile")
for (table, model, related_table) in realm_tables:
re_map_foreign_keys(data, table, 'realm', related_table="realm")
update_model_ids(model, data, table, related_table)
bulk_import_model(data, model, table)
if 'zerver_huddle' in data: if 'zerver_huddle' in data:
bulk_import_model(data, Huddle, 'zerver_huddle') bulk_import_model(data, Huddle, 'zerver_huddle')