Merge ded49ab into 693bf7f

serrano/resources/category.py

@@ -39,7 +39,7 @@ def category_posthook(instance, data, request):
 class CategoryParametizer(Parametizer):
     "Supported params and their defaults for Category endpoints."
 
-    published = BoolParam()
+    unpublished = BoolParam(False)
 
 
 class CategoryBase(ThrottledResource):
@@ -101,15 +101,7 @@ def get(self, request, pk=None):
 
         # For privileged users, check if any filters are applied, otherwise
         # only allow for published objects.
-        if can_change_category(request.user):
-            filters = {}
-
-            if params['published'] is not None:
-                filters['published'] = params['published']
-
-            if filters:
-                queryset = queryset.filter(**filters)
-        else:
+        if not can_change_category(request.user) or not params['unpublished']:
             queryset = queryset.published()
 
         return self.prepare(request, queryset, **params)

serrano/resources/concept.py

@@ -84,7 +84,7 @@ class ConceptParametizer(Parametizer):
 
     sort = StrParam()
     order = StrParam('asc')
-    published = BoolParam()
+    unpublished = BoolParam(False)
     embed = BoolParam(False)
     brief = BoolParam(False)
     query = StrParam()
@@ -215,15 +215,7 @@ def get(self, request, pk=None):
 
         # For privileged users, check if any filters are applied, otherwise
         # only allow for published objects.
-        if can_change_concept(request.user):
-            filters = {}
-
-            if params['published'] is not None:
-                filters['published'] = params['published']
-
-            if filters:
-                queryset = queryset.filter(**filters)
-        else:
+        if not can_change_concept(request.user) or not params['unpublished']:
             queryset = queryset.published()
 
         # If Haystack is installed, perform the search

serrano/resources/field/base.py

@@ -69,7 +69,7 @@ class FieldParametizer(Parametizer):
 
     sort = StrParam()
     order = StrParam('asc')
-    published = BoolParam()
+    unpublished = BoolParam(False)
     brief = BoolParam(False)
     query = StrParam()
     limit = IntParam()
@@ -142,15 +142,7 @@ def get(self, request):
 
         # For privileged users, check if any filters are applied, otherwise
         # only allow for published objects.
-        if can_change_field(request.user):
-            filters = {}
-
-            if params['published'] is not None:
-                filters['published'] = params['published']
-
-            if filters:
-                queryset = queryset.filter(**filters)
-        else:
+        if not can_change_field(request.user) or not params['unpublished']:
             queryset = queryset.published()
 
         # If Haystack is installed, perform the search

tests/cases/resources/tests/field.py

@@ -66,7 +66,7 @@ def test_get_privileged(self):
         # Superuser sees everything
         self.client.login(username='root', password='password')
 
-        response = self.client.get('/api/fields/',
+        response = self.client.get('/api/fields/?unpublished=1',
             HTTP_ACCEPT='application/json')
         self.assertEqual(len(json.loads(response.content)), 12)