Merge 088466a into a26cc78

dbca-wa · Jun 27, 2017 · 2d61410 · 2d61410
2 parents a26cc78 + 088466a
commit 2d61410
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/wildlifelicensing/apps/returns/api/urls.py b/wildlifelicensing/apps/returns/api/urls.py
@@ -3,7 +3,7 @@
 from wildlifelicensing.apps.returns.api import views
 
 urlpatterns = [
-    url(r'data/(?P<return_type_pk>[0-9])/(?P<resource_number>[0-9]?)/?', views.ReturnsDataView.as_view(),
+    url(r'data/(?P<return_type_pk>[0-9]+)/(?P<resource_number>[0-9]+)/?', views.ReturnsDataView.as_view(),
         name='data'),
     url(r'', views.ExplorerView.as_view(), name='explorer')
 ]
diff --git a/wildlifelicensing/apps/returns/api/views.py b/wildlifelicensing/apps/returns/api/views.py
@@ -25,7 +25,7 @@ class ExplorerView(APIUserRequiredMixin, View):
     (@see ReturnsDataView view)
     """
 
-    def get(self, request):
+    def get(self, request, *args, **kwargs):
         queryset = ReturnType.objects.all()
         # for API purpose, increase the session timeout
         set_api_session_timeout(request)