From b3f951d2cf9eab6ea5a530ae3048feaa4defe2b8 Mon Sep 17 00:00:00 2001 From: Rhea Parekh Date: Fri, 6 Apr 2018 19:51:37 +0530 Subject: [PATCH] import script: User profile ids should be allocated before allocating bot ids. --- zerver/lib/export.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/zerver/lib/export.py b/zerver/lib/export.py index a0004fdb8d..32433fff74 100644 --- a/zerver/lib/export.py +++ b/zerver/lib/export.py @@ -1632,6 +1632,7 @@ def do_import_realm(import_dir: Path, subdomain: str) -> Realm: update_message_foreign_keys(import_dir) fix_datetime_fields(data, 'zerver_userprofile') + update_model_ids(UserProfile, data, 'zerver_userprofile', 'user_profile') re_map_foreign_keys(data, 'zerver_userprofile', 'realm', related_table="realm") re_map_foreign_keys(data, 'zerver_userprofile', 'bot_owner', related_table="user_profile") re_map_foreign_keys(data, 'zerver_userprofile', 'default_sending_stream', @@ -1647,8 +1648,6 @@ def do_import_realm(import_dir: Path, subdomain: str) -> Realm: del user_profile_dict['user_permissions'] del user_profile_dict['groups'] - update_model_ids(UserProfile, data, 'zerver_userprofile', 'user_profile') - user_profiles = [UserProfile(**item) for item in data['zerver_userprofile']] for user_profile in user_profiles: user_profile.set_unusable_password()