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

registration: Set is_realm_admin on user creation.

Browse Source 
This makes it easier for later parts of the user creation/onboarding process
to condition on whether the user is a realm admin.

No change in behavior.
This commit is contained in:
Rishi Gupta
2017-08-17 22:12:22 -07:00
committed by Tim Abbott
parent d28337869e
commit 7c3f20d2ba
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/lib/actions.py
View File

@@ -414,15 +414,16 @@ def notify_created_bot(user_profile):
send_event(event, bot_owner_userids(user_profile)) send_event(event, bot_owner_userids(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, is_realm_admin=False, bot_type=None, bot_owner=None, tos_version=None,
timezone=u"", 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, Optional[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 # type: (Text, Optional[Text], Realm, Text, Text, bool, 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, is_realm_admin=is_realm_admin,
bot_type=bot_type, bot_owner=bot_owner,
tos_version=tos_version, timezone=timezone, 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,

5
zerver/lib/create_user.py
View File

@@ -52,15 +52,16 @@ def create_user_profile(realm, email, password, active, bot_type, full_name,
return user_profile return user_profile
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, is_realm_admin=False, bot_type=None, bot_owner=None, tos_version=None,
timezone=u"", 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, Optional[Text], Realm, Text, Text, bool, Optional[int], Optional[UserProfile], Optional[Text], Text, Text, bool, Optional[Stream], Optional[Stream], Optional[bool], Optional[int]) -> UserProfile # type: (Text, Optional[Text], Realm, Text, Text, bool, 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, timezone) is_mirror_dummy, tos_version, timezone)
user_profile.is_realm_admin = is_realm_admin
user_profile.avatar_source = avatar_source user_profile.avatar_source = avatar_source
user_profile.timezone = timezone user_profile.timezone = timezone
user_profile.default_sending_stream = default_sending_stream user_profile.default_sending_stream = default_sending_stream

3
zerver/views/registration.py
View File

@@ -215,7 +215,7 @@ def accounts_register(request):
do_set_user_display_setting(user_profile, 'timezone', timezone) do_set_user_display_setting(user_profile, 'timezone', timezone)
else: else:
user_profile = do_create_user(email, password, realm, full_name, short_name, user_profile = do_create_user(email, password, realm, full_name, short_name,
prereg_user=prereg_user, prereg_user=prereg_user, is_realm_admin=realm_creation,
tos_version=settings.TOS_VERSION, tos_version=settings.TOS_VERSION,
timezone=timezone, timezone=timezone,
newsletter_data={"IP": request.META['REMOTE_ADDR']}) newsletter_data={"IP": request.META['REMOTE_ADDR']})
@@ -223,7 +223,6 @@ def accounts_register(request):
send_initial_pms(user_profile) send_initial_pms(user_profile)
if realm_creation: if realm_creation:
do_change_is_admin(user_profile, True)
setup_initial_private_stream(user_profile) setup_initial_private_stream(user_profile)
send_initial_realm_messages(realm) send_initial_realm_messages(realm)