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

Access the UserProfile's new is_active field rather than User's.

Browse Source 
(imported from commit ed5bdaf3e3d6d20bfb741efdac48d30482ab9ef7)
This commit is contained in:
Tim Abbott
2013-03-28 15:47:22 -04:00
parent 1443edce00
commit 2fcbb31dcf
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zephyr/lib/actions.py
View File

@@ -68,7 +68,7 @@ def do_create_user(email, password, realm, full_name, short_name,
full_name=user_profile.full_name)),
users=[up.id for up in
UserProfile.objects.select_related().filter(realm=user_profile.realm,
user__is_active=True)])
is_active=True)])
tornado_callbacks.send_notification(notice)
return user_profile
@@ -115,7 +115,7 @@ def do_deactivate(user_profile):
full_name=user_profile.full_name)),
users=[up.id for up in
UserProfile.objects.select_related().filter(realm=user_profile.realm,
user__is_active=True)])
is_active=True)])
tornado_callbacks.send_notification(notice)
@@ -203,7 +203,7 @@ def do_send_message(message, rendered_content=None, no_log=False,
message.save()
ums_to_create = [UserMessage(user_profile=user_profile, message=message)
for user_profile in recipients
if user_profile.user.is_active]
if user_profile.is_active]
for um in ums_to_create:
sent_by_human = message.sending_client.name.lower() in \
['website', 'iphone', 'android']
@@ -784,7 +784,7 @@ def do_events_register(user_profile, apply_markdown=True, event_types=None):
'full_name' : profile.full_name}
for profile in
UserProfile.objects.select_related().filter(realm=user_profile.realm,
user__is_active=True)]
is_active=True)]
if event_types is None or "subscription" in event_types:
ret['subscriptions'] = gather_subscriptions(user_profile)