Skip to content

Commit

Permalink
Merge branch 'master' into grant_detail
Browse files Browse the repository at this point in the history
  • Loading branch information
thelostone-mc authored May 8, 2019
2 parents 843d6e9 + a9c001c commit ef9fa0e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/grants/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def grant_details(request, grant_id, grant_slug):
milestones = grant.milestones.order_by('due_date')
updates = grant.updates.order_by('-created_on')
subscriptions = grant.subscriptions.filter(active=True, error=False)
cancelled_subscriptions = grant.subscriptions.filter(Q(active=False, error=False) | Q(error=True))
cancelled_subscriptions = grant.subscriptions.filter(active=False, error=False)
contributions = Contribution.objects.filter(subscription__in=grant.subscriptions.all())
user_subscription = grant.subscriptions.filter(contributor_profile=profile, active=True).first()
user_non_errored_subscription = grant.subscriptions.filter(contributor_profile=profile, active=True, error=False).first()
Expand Down

0 comments on commit ef9fa0e

Please sign in to comment.