paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import: Add subdomain in the import script.

Browse Source 
Also remove user input of subdomain in the slack data
conversion script.
This commit is contained in:
Rhea Parekh
2018-04-06 05:51:16 +05:30
committed by Tim Abbott
parent ad861c5fae
commit 2baa9bc16e
6 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/lib/export.py
View File

@@ -1568,7 +1568,7 @@ def import_uploads(import_dir: Path, processing_avatars: bool=False,
# Because the Python object => JSON conversion process is not fully
# faithful, we have to use a set of fixers (e.g. on DateTime objects
# and Foreign Keys) to do the import correctly.
def do_import_realm(import_dir: Path) -> Realm:
def do_import_realm(import_dir: Path, subdomain: str) -> Realm:
logging.info("Importing realm dump %s" % (import_dir,))
if not os.path.exists(import_dir):
raise Exception("Missing import directory!")
@@ -1585,6 +1585,9 @@ def do_import_realm(import_dir: Path) -> Realm:
re_map_foreign_keys(data, 'zerver_realm', 'notifications_stream', related_table="stream")
fix_datetime_fields(data, 'zerver_realm')
# Fix realm subdomain information
data['zerver_realm'][0]['string_id'] = subdomain
data['zerver_realm'][0]['name'] = subdomain
fix_realm_authentication_bitfield(data, 'zerver_realm', 'authentication_methods')
update_model_ids(Realm, data, 'zerver_realm', 'realm')