Skip to content

Commit

Permalink
Merge branch '2.0' of github.com:nadineproject/nadine into 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
abkruse committed Aug 8, 2017
2 parents bf1f535 + 5e28a84 commit 35f8dcc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tablet/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def user_profile(request, username):

# Pull our open alerts
alert_list = [MemberAlert.MEMBER_AGREEMENT, MemberAlert.TAKE_PHOTO, MemberAlert.ORIENTATION, MemberAlert.KEY_AGREEMENT, MemberAlert.ASSIGN_CABINET, MemberAlert.ASSIGN_MAILBOX, MemberAlert.RETURN_DOOR_KEY, MemberAlert.RETURN_DESK_KEY]
if user.membership.active_subscriptions():
if user.profile.is_active():
open_alerts = user.profile.open_alerts().filter(key__in=alert_list)
else:
open_alerts = None
Expand Down

0 comments on commit 35f8dcc

Please sign in to comment.