Merge pull request #173 from rdmorganiser/api

Add API filter options
rdmorganiser · Jan 21, 2020 · 9f78501 · 9f78501
2 parents 778cd89 + a8ce00c
commit 9f78501
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/rdmo/options/viewsets.py b/rdmo/options/viewsets.py
@@ -18,7 +18,8 @@ class OptionSetViewSet(ModelViewSet):
     filter_backends = (DjangoFilterBackend,)
     filterset_fields = (
         'uri',
-        'key'
+        'key',
+        'comment'
     )
 
     @action(detail=False)
@@ -41,7 +42,8 @@ class OptionViewSet(ModelViewSet):
     filterset_fields = (
         'uri',
         'key',
-        'optionset'
+        'optionset',
+        'comment'
     )
 
     @action(detail=False)

diff --git a/rdmo/questions/viewsets.py b/rdmo/questions/viewsets.py
@@ -26,7 +26,8 @@ class CatalogViewSet(ModelViewSet):
     filter_backends = (DjangoFilterBackend,)
     filterset_fields = (
         'uri',
-        'key'
+        'key',
+        'comment'
     )
 
     @action(detail=True)
@@ -51,7 +52,8 @@ class SectionViewSet(ModelViewSet):
         'uri',
         'path',
         'key',
-        'catalog'
+        'catalog',
+        'comment'
     )
 
     @action(detail=True)
@@ -73,10 +75,13 @@ class QuestionSetViewSet(ModelViewSet):
 
     filter_backends = (DjangoFilterBackend,)
     filterset_fields = (
+        'attribute',
         'uri',
         'path',
         'key',
-        'section'
+        'section',
+        'comment',
+        'is_collection'
     )
 
     @action(detail=True)
@@ -98,13 +103,16 @@ class QuestionViewSet(ModelViewSet):
 
     filter_backends = (DjangoFilterBackend,)
     filterset_fields = (
+        'attribute',
         'uri',
         'path',
         'key',
         'questionset',
         'is_collection',
         'value_type',
-        'widget_type'
+        'widget_type',
+        'unit',
+        'comment'
     )
 
     @action(detail=True)

diff --git a/rdmo/tasks/viewsets.py b/rdmo/tasks/viewsets.py
@@ -16,7 +16,8 @@ class TaskViewSet(ModelViewSet):
     filter_backends = (DjangoFilterBackend,)
     filterset_fields = (
         'uri',
-        'key'
+        'key',
+        'comment'
     )
 
     @action(detail=False)

diff --git a/rdmo/views/viewsets.py b/rdmo/views/viewsets.py
@@ -16,7 +16,8 @@ class ViewViewSet(ModelViewSet):
     filter_backends = (DjangoFilterBackend,)
     filterset_fields = (
         'uri',
-        'key'
+        'key',
+        'comment'
     )
 
     @action(detail=False)