paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-10 08:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add timezone argument to do_create_user function.

Browse Source
This commit is contained in:
hackerkid
2017-05-04 18:49:06 +05:30
committed by Tim Abbott
parent e219dda071
commit 34dae708d6
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/lib/actions.py
View File

@@ -402,15 +402,15 @@ def notify_created_bot(user_profile):
def do_create_user(email, password, realm, full_name, short_name, def do_create_user(email, password, realm, full_name, short_name,
active=True, bot_type=None, bot_owner=None, tos_version=None, active=True, bot_type=None, bot_owner=None, tos_version=None,
avatar_source=UserProfile.AVATAR_FROM_GRAVATAR, timezone=u"", avatar_source=UserProfile.AVATAR_FROM_GRAVATAR,
default_sending_stream=None, default_events_register_stream=None, default_sending_stream=None, default_events_register_stream=None,
default_all_public_streams=None, prereg_user=None, default_all_public_streams=None, prereg_user=None,
newsletter_data=None): newsletter_data=None):
# type: (Text, Text, Realm, Text, Text, bool, Optional[int], Optional[UserProfile], Optional[Text], Text, Optional[Stream], Optional[Stream], bool, Optional[PreregistrationUser], Optional[Dict[str, str]]) -> UserProfile # type: (Text, Text, Realm, Text, Text, bool, Optional[int], Optional[UserProfile], Optional[Text], Text, Text, Optional[Stream], Optional[Stream], bool, Optional[PreregistrationUser], Optional[Dict[str, str]]) -> UserProfile
user_profile = create_user(email=email, password=password, realm=realm, user_profile = create_user(email=email, password=password, realm=realm,
full_name=full_name, short_name=short_name, full_name=full_name, short_name=short_name,
active=active, bot_type=bot_type, bot_owner=bot_owner, active=active, bot_type=bot_type, bot_owner=bot_owner,
tos_version=tos_version, avatar_source=avatar_source, tos_version=tos_version, timezone=timezone, avatar_source=avatar_source,
default_sending_stream=default_sending_stream, default_sending_stream=default_sending_stream,
default_events_register_stream=default_events_register_stream, default_events_register_stream=default_events_register_stream,
default_all_public_streams=default_all_public_streams) default_all_public_streams=default_all_public_streams)

6
zerver/lib/bulk_create.py
View File

@@ -6,8 +6,8 @@ from zerver.models import Realm, Stream, UserProfile, Huddle, \
Subscription, Recipient, Client, RealmAuditLog, get_huddle_hash Subscription, Recipient, Client, RealmAuditLog, get_huddle_hash
from zerver.lib.create_user import create_user_profile from zerver.lib.create_user import create_user_profile
def bulk_create_users(realm, users_raw, bot_type=None, tos_version=None): def bulk_create_users(realm, users_raw, bot_type=None, tos_version=None, timezone=u""):
# type: (Realm, Set[Tuple[Text, Text, Text, bool]], Optional[int], Optional[Text]) -> None # type: (Realm, Set[Tuple[Text, Text, Text, bool]], Optional[int], Optional[Text], Text) -> None
""" """
Creates and saves a UserProfile with the given email. Creates and saves a UserProfile with the given email.
Has some code based off of UserManage.create_user, but doesn't .save() Has some code based off of UserManage.create_user, but doesn't .save()
@@ -21,7 +21,7 @@ def bulk_create_users(realm, users_raw, bot_type=None, tos_version=None):
profile = create_user_profile(realm, email, profile = create_user_profile(realm, email,
initial_password(email), active, bot_type, initial_password(email), active, bot_type,
full_name, short_name, None, False, tos_version, full_name, short_name, None, False, tos_version,
tutorial_status=UserProfile.TUTORIAL_FINISHED, timezone, tutorial_status=UserProfile.TUTORIAL_FINISHED,
enter_sends=True) enter_sends=True)
profiles_to_create.append(profile) profiles_to_create.append(profile)
UserProfile.objects.bulk_create(profiles_to_create) UserProfile.objects.bulk_create(profiles_to_create)

13
zerver/lib/create_user.py
View File

@@ -26,9 +26,9 @@ def random_api_key():
# Recipient objects # Recipient objects
def create_user_profile(realm, email, password, active, bot_type, full_name, def create_user_profile(realm, email, password, active, bot_type, full_name,
short_name, bot_owner, is_mirror_dummy, tos_version, short_name, bot_owner, is_mirror_dummy, tos_version,
tutorial_status=UserProfile.TUTORIAL_WAITING, timezone, tutorial_status=UserProfile.TUTORIAL_WAITING,
enter_sends=False): enter_sends=False):
# type: (Realm, Text, Optional[Text], bool, Optional[int], Text, Text, Optional[UserProfile], bool, Optional[Text], Optional[Text], bool) -> UserProfile # type: (Realm, Text, Optional[Text], bool, Optional[int], Text, Text, Optional[UserProfile], bool, Text, Optional[Text], Optional[Text], bool) -> UserProfile
now = timezone_now() now = timezone_now()
email = UserManager.normalize_email(email) email = UserManager.normalize_email(email)
@@ -37,7 +37,7 @@ def create_user_profile(realm, email, password, active, bot_type, full_name,
last_login=now, date_joined=now, realm=realm, last_login=now, date_joined=now, realm=realm,
pointer=-1, is_bot=bool(bot_type), bot_type=bot_type, pointer=-1, is_bot=bool(bot_type), bot_type=bot_type,
bot_owner=bot_owner, is_mirror_dummy=is_mirror_dummy, bot_owner=bot_owner, is_mirror_dummy=is_mirror_dummy,
tos_version=tos_version, tos_version=tos_version, timezone=timezone,
tutorial_status=tutorial_status, tutorial_status=tutorial_status,
enter_sends=enter_sends, enter_sends=enter_sends,
onboarding_steps=ujson.dumps([]), onboarding_steps=ujson.dumps([]),
@@ -53,15 +53,16 @@ def create_user_profile(realm, email, password, active, bot_type, full_name,
def create_user(email, password, realm, full_name, short_name, def create_user(email, password, realm, full_name, short_name,
active=True, bot_type=None, bot_owner=None, tos_version=None, active=True, bot_type=None, bot_owner=None, tos_version=None,
avatar_source=UserProfile.AVATAR_FROM_GRAVATAR, timezone=u"", avatar_source=UserProfile.AVATAR_FROM_GRAVATAR,
is_mirror_dummy=False, default_sending_stream=None, is_mirror_dummy=False, default_sending_stream=None,
default_events_register_stream=None, default_events_register_stream=None,
default_all_public_streams=None, user_profile_id=None): default_all_public_streams=None, user_profile_id=None):
# type: (Text, Text, Realm, Text, Text, bool, Optional[int], Optional[UserProfile], Optional[Text], Text, bool, Optional[Stream], Optional[Stream], Optional[bool], Optional[int]) -> UserProfile # type: (Text, Text, Realm, Text, Text, bool, Optional[int], Optional[UserProfile], Optional[Text], Text, Text, bool, Optional[Stream], Optional[Stream], Optional[bool], Optional[int]) -> UserProfile
user_profile = create_user_profile(realm, email, password, active, bot_type, user_profile = create_user_profile(realm, email, password, active, bot_type,
full_name, short_name, bot_owner, full_name, short_name, bot_owner,
is_mirror_dummy, tos_version) is_mirror_dummy, tos_version, timezone)
user_profile.avatar_source = avatar_source user_profile.avatar_source = avatar_source
user_profile.timezone = timezone
user_profile.default_sending_stream = default_sending_stream user_profile.default_sending_stream = default_sending_stream
user_profile.default_events_register_stream = default_events_register_stream user_profile.default_events_register_stream = default_events_register_stream
# Allow the ORM default to be used if not provided # Allow the ORM default to be used if not provided