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

Rename do_[rd]activate to do_[rd]activate_user.

Browse Source 
For similarity with do_activate_user.

(imported from commit 2874af84dbe1ce666de10e0d8ffe2daa8bad9731)
This commit is contained in:
Tim Abbott
2013-11-16 11:11:15 -05:00
parent 6497f330ea
commit f3fa78d30c
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/lib/actions.py
View File

@@ -135,7 +135,7 @@ def delete_all_user_sessions():
for session in Session.objects.all():
delete_session(session)
def do_deactivate(user_profile, log=True, _cascade=True):
def do_deactivate_user(user_profile, log=True, _cascade=True):
if not user_profile.is_active:
return
@@ -160,7 +160,7 @@ def do_deactivate(user_profile, log=True, _cascade=True):
bot_profiles = UserProfile.objects.filter(is_bot=True, is_active=True,
bot_owner=user_profile)
for profile in bot_profiles:
do_deactivate(profile, _cascade=False)
do_deactivate_user(profile, _cascade=False)
def do_change_user_email(user_profile, new_email):
old_email = user_profile.email
@@ -1055,7 +1055,7 @@ def do_activate_user(user_profile, log=True, join_date=timezone.now()):
notify_created_user(user_profile)
def do_reactivate(user_profile):
def do_reactivate_user(user_profile):
# Unlike do_activate_user, this is meant for re-activating existing users,
# so it doesn't reset their password, etc.
user_profile.is_active = True