Skip to content

Commit

Permalink
Updates to test urls through the browser
Browse files Browse the repository at this point in the history
- Changed url order
- Added BrowsableAPIRenderer
- Added rest_framework to INSTALLED_APP
- Added auth to the apikey package
  • Loading branch information
atogle committed May 7, 2013
1 parent 7583020 commit 8493cdf
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
1 change: 1 addition & 0 deletions src/project/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@

# 3rd-party reusaple apps
'djangorestframework',
'rest_framework',
'south',
'django_nose',
'debug_toolbar',
Expand Down
2 changes: 1 addition & 1 deletion src/sa_api/apikey/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# a package
from . import auth
8 changes: 4 additions & 4 deletions src/sa_api/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@
lambda *a, **k: None,
name='submission-list'),

url(r'^(?P<owner_username>[^/]+)/datasets/(?P<dataset_slug>[^/]+)/(?P<submission_set_name>[^/]+)$',
lambda *a, **k: None,
name='dataset-submission-list'),

url(r'^(?P<owner_username>[^/]+)/datasets/(?P<dataset_slug>[^/]+)/places/(?P<place_id>\d+)$',
views.PlaceInstanceView.as_view(),
name='place-detail'),
url(r'^(?P<owner_username>[^/]+)/datasets/(?P<dataset_slug>[^/]+)/places$',
views.PlaceListView.as_view(),
name='place-list'),

url(r'^(?P<owner_username>[^/]+)/datasets/(?P<dataset_slug>[^/]+)/(?P<submission_set_name>[^/]+)$',
lambda *a, **k: None,
name='dataset-submission-list'),

url(r'^(?P<owner_username>[^/]+)/datasets/(?P<dataset_slug>[^/]+)$',
lambda *a, **k: None,
name='dataset-detail'),
Expand Down
3 changes: 2 additions & 1 deletion src/sa_api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from rest_framework import (views, permissions, mixins, authentication,
generics, exceptions, status)
from rest_framework.response import Response
from rest_framework.renderers import BrowsableAPIRenderer
from rest_framework.exceptions import APIException
from . import models
from . import serializers
Expand Down Expand Up @@ -205,7 +206,7 @@ class PlaceListView (OwnedResourceMixin, generics.ListCreateAPIView):
model = models.Place
serializer_class = serializers.PlaceSerializer
pagination_serializer_class = serializers.FeatureCollectionSerializer
renderer_classes = (renderers.GeoJSONRenderer,)
renderer_classes = (renderers.GeoJSONRenderer,BrowsableAPIRenderer)

def pre_save(self, obj):
super(PlaceListView, self).pre_save(obj)
Expand Down

0 comments on commit 8493cdf

Please sign in to comment.