fix resolve conditions

rdmorganiser · Nov 23, 2017 · 9956daf · 9956daf
1 parent ae7c95b
commit 9956daf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/rdmo/projects/tests/test_viewsets.py b/rdmo/projects/tests/test_viewsets.py
@@ -80,6 +80,9 @@ class ValueTests(TestViewsetMixin, TestSingleObjectMixin, ProjectsViewsetTestCas
         },
         'delete_viewset': {
             'owner': 204, 'manager': 204, 'author': 204, 'guest': 403, 'user': 403, 'anonymous': 403
+        },
+        'resolve_viewset': {
+            'owner': 200, 'manager': 200, 'author': 200, 'guest': 200, 'user': 403, 'anonymous': 403
         }
     }
 
@@ -119,6 +122,13 @@ def _test_delete_viewset(self, username):
             })
             instance.save(update_fields=None)
 
+    def _test_resolve_viewset(self, username):
+        for instance in self.instances:
+            self.assert_viewset('resolve_viewset', 'get', 'resolve', username, query_params={
+                'project': self.project_id,
+                'condition': 1
+            })
+
 
 class QuestionEntityTests(TestReadOnlyModelViewsetMixin, ProjectsViewsetTestCase):
 

diff --git a/rdmo/projects/viewsets.py b/rdmo/projects/viewsets.py
@@ -101,8 +101,7 @@ def dispatch(self, request, *args, **kwargs):
 
     @list_route()
     def resolve(self, request):
-        if not request.user.has_perm('projects.view_value', self.project):
-            self.permission_denied(request)
+        self.project = self.get_project(request)
 
         condition = self.get_condition(request)
         return Response({'result': condition.resolve(self.project, self.snapshot)})