CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-15 21:03:26 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix confusion of user / user_profile objects in MIT signup codepaths.

Browse Source 
(imported from commit f39943bf31f705365ed9743c6d2e9239fed8c9e2)
This commit is contained in:
Tim Abbott 2012-12-13 09:11:17 -05:00
parent 1aa825e6d0
commit e6fef7d7ba
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zephyr/views.py
View File

@ -63,7 +63,7 @@ def get_stream(stream_name, realm):
except Stream.DoesNotExist:
return None
def notify_new_user(user, internal=False):
def notify_new_user(user_profile, internal=False):
if internal:
# When this is done using manage.py vs. the web interface
internal_blurb = " **INTERNAL SIGNUP** "
@ -71,12 +71,13 @@ def notify_new_user(user, internal=False):
internal_blurb = " "
internal_send_message("humbug+signups@humbughq.com",
Recipient.STREAM, "signups", user.realm.domain,
Recipient.STREAM, "signups", user_profile.realm.domain,
"%s <`%s`> just signed up for Humbug!%s(total: **%i**)" % (
user.full_name,
user.user.email,
user_profile.full_name,
user_profile.user.email,
internal_blurb,
UserProfile.objects.filter(realm=user.realm, user__is_active=True).count(),
UserProfile.objects.filter(realm=user_profile.realm,
user__is_active=True).count(),
)
)
@ -115,12 +116,13 @@ def accounts_register(request):
user = User.objects.get(email=email)
do_activate_user(user)
do_change_password(user, password)
do_change_full_name(user.userprofile, full_name)
user_profile = user.userprofile
do_change_full_name(user_profile, full_name)
else:
user = do_create_user(email, password, realm, full_name, short_name)
add_default_subs(user)
user_profile = do_create_user(email, password, realm, full_name, short_name)
add_default_subs(user_profile)
notify_new_user(user)
notify_new_user(user_profile)
login(request, authenticate(username=email, password=password))
return HttpResponseRedirect(reverse('zephyr.views.home'))