diff --git a/app/assets/v2/js/pages/fulfill_bounty.js b/app/assets/v2/js/pages/fulfill_bounty.js index edf49c1589b..ed822612871 100644 --- a/app/assets/v2/js/pages/fulfill_bounty.js +++ b/app/assets/v2/js/pages/fulfill_bounty.js @@ -138,7 +138,7 @@ window.onload = function() { }; // Get bountyId from the database - var uri = '/api/v0.1/bounties/?github_url=' + issueURL + '&network=' + $('input[name=network]').val() + '&standard_bounties_id=' + $('input[name=standard_bounties_id]').val(); + var uri = '/api/v0.1/bounties/?event_tag=all&github_url=' + issueURL + '&network=' + $('input[name=network]').val() + '&standard_bounties_id=' + $('input[name=standard_bounties_id]').val(); $.get(uri, function(results, status) { results = sanitizeAPIResults(results); diff --git a/app/dashboard/router.py b/app/dashboard/router.py index c5d60923a95..c1859fe161d 100644 --- a/app/dashboard/router.py +++ b/app/dashboard/router.py @@ -201,11 +201,14 @@ def get_queryset(self): # filtering event_tag = self.request.query_params.get('event_tag', '') if event_tag: - try: - evt = HackathonEvent.objects.filter(slug__iexact=event_tag).latest('id') - queryset = queryset.filter(event__pk=evt.pk) - except HackathonEvent.DoesNotExist: - return Bounty.objects.none() + if event_tag == 'all': + pass + else: + try: + evt = HackathonEvent.objects.filter(slug__iexact=event_tag).latest('id') + queryset = queryset.filter(event__pk=evt.pk) + except HackathonEvent.DoesNotExist: + return Bounty.objects.none() else: queryset = queryset.filter(event=None)