Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed unpaid paper reminders queryset to be evaluated every time.
  • Loading branch information
annttu committed Oct 15, 2013
1 parent 43ea3d7 commit daeb149
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 9 deletions.
11 changes: 2 additions & 9 deletions membership/urls.py
Expand Up @@ -103,15 +103,8 @@
'template_object_name': 'member',
'mimetype': 'text/plain'},
name='approved_memberships_emails'),
url(r'memberships/unpaid_paper_reminded/$', 'membership.views.member_object_list',
{'queryset': Membership.paper_reminder_sent_unpaid_after(),
'template_name': 'membership/membership_list.html',
'template_object_name': 'member',
'paginate_by': ENTRIES_PER_PAGE}, name='unpaid_paper_reminded_memberships'),
url(r'memberships/unpaid_paper_reminded-plain/$', 'membership.views.member_object_list',
{'queryset': Membership.paper_reminder_sent_unpaid_after().order_by('id'),
'template_name': 'membership/membership_list_plaintext.html',
'template_object_name': 'member'},
url(r'memberships/unpaid_paper_reminded/$', 'membership.views.unpaid_paper_reminded', name='unpaid_paper_reminded_memberships'),
url(r'memberships/unpaid_paper_reminded-plain/$', 'membership.views.unpaid_paper_reminded_plain',
name='unpaid_paper_reminded_memberships_plain'),
url(r'memberships/deleted/$', 'membership.views.member_object_list',
{'queryset': Membership.objects.filter(status__exact='D').order_by('-id'),
Expand Down
20 changes: 20 additions & 0 deletions membership/views.py
Expand Up @@ -811,6 +811,26 @@ def membership_duplicates(request, id):

return member_object_list(request, **view_params)

@permission_required('membership.read_members')
def unpaid_paper_reminded(request):
view_params = {'queryset': Membership.paper_reminder_sent_unpaid_after(),
'template_name': 'membership/membership_list.html',
'template_object_name': 'member',
'paginate_by': ENTRIES_PER_PAGE
}

return member_object_list(request, **view_params)

@permission_required('membership.read_members')
def unpaid_paper_reminded_plain(request):
view_params = {'queryset': Membership.paper_reminder_sent_unpaid_after().order_by('id'),
'template_name': 'membership/membership_list_plaintext.html',
'template_object_name': 'member'
}

return member_object_list(request, **view_params)


@permission_required('membership.delete_members')
@transaction.commit_on_success
def membership_delete(request, id, template_name='membership/membership_delete.html'):
Expand Down

0 comments on commit daeb149

Please sign in to comment.