paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-07 15:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch functions like do_activate_user to accept UserProfiles.

Browse Source 
Only a few of them took a User as an argument anyway.

This is preparatory work for merging the User and UserProfile models.

(imported from commit 65b2bd2453597531bcf135ccf24d2a4615cd0d2a)
This commit is contained in:
Tim Abbott
2013-03-08 13:58:18 -05:00
parent 9d82bb5318
commit 2223b60dc0
5 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
zephyr/lib/actions.py
View File

@@ -77,10 +77,10 @@ def do_deactivate(user_profile):
'user': user_profile.user.email,
'domain': user_profile.realm.domain})
def do_change_user_email(user, new_email):
old_email = user.email
user.email = new_email
user.save(update_fields=["email"])
def do_change_user_email(user_profile, new_email):
old_email = user_profile.user.email
user_profile.user.email = new_email
user_profile.user.save(update_fields=["email"])
log_event({'type': 'user_email_changed',
'old_email': old_email,
@@ -430,19 +430,21 @@ def log_subscription_property_change(user_email, property, property_dict):
event.update(property_dict)
log_event(event)
def do_activate_user(user, log=True, join_date=timezone.now()):
def do_activate_user(user_profile, log=True, join_date=timezone.now()):
user = user_profile.user
user.is_active = True
user.set_password(initial_password(user.email))
user.date_joined = join_date
user.save(update_fields=["is_active", "date_joined", "password"])
if log:
domain = UserProfile.objects.get(user=user).realm.domain
domain = user_profile.realm.domain
log_event({'type': 'user_activated',
'user': user.email,
'domain': domain})
def do_change_password(user, password, log=True, commit=True):
def do_change_password(user_profile, password, log=True, commit=True):
user = user_profile.user
user.set_password(password)
if commit:
user.save(update_fields=["password"])