fixes #332 - include full page data in maps api

localwiki · Mar 26, 2013 · b87b02a · b87b02a
1 parent d963ba2
commit b87b02a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/docs/source/api.rst b/docs/source/api.rst
@@ -333,6 +333,14 @@ List
 
     /api/map/
 
+Parameters
+__________
+
+full
+
+* `False`: (default) pages for maps are returned as links
+* `True`: pages for maps are returned in full (see `Pages`_ example object)
+
 Fetch
 ~~~~~
 

diff --git a/sapling/maps/api.py b/sapling/maps/api.py
@@ -11,7 +11,7 @@
 
 
 class MapResource(pages.api.PageURLMixin, gis_resources.ModelResource):
-    page = fields.ToOneField('pages.api.PageResource', 'page')
+    page = fields.ToOneField('pages.api.PageResource', 'page', full=True)
 
     class Meta:
         queryset = MapData.objects.all()

diff --git a/sapling/pages/api.py b/sapling/pages/api.py
@@ -167,6 +167,11 @@ def get_search(self, request, **kwargs):
         self.log_throttled_access(request)
         return self.create_response(request, object_list)
 
+    def dehydrate(self, bundle):
+        if not bundle.request.GET.get('full'):
+            bundle = bundle.data['resource_uri']
+        return bundle
+
 
 # We don't use the PageURLMixin approach here because it becomes
 # too complicated to generate pretty URLs with the historical version