Merge branch 'develop' of https://github.com/akvo/akvo-rsr into develop

akvo · Oct 29, 2019 · 30c6fe0 · 30c6fe0
2 parents f227680 + 818a658
commit 30c6fe0
Show file tree

Hide file tree

Showing 17 changed files with 215 additions and 923 deletions.
diff --git a/akvo/rest/serializers/project.py b/akvo/rest/serializers/project.py
@@ -60,7 +60,9 @@ class Meta:
     def get_editable(self, obj):
         """Method used by the editable SerializerMethodField"""
         user = self.context['request'].user
-        return user.has_perm('rsr.change_project', obj)
+        if not user.is_authenticated():
+            return False
+        return user.can_edit_project(obj)
 
 
 class ProjectDirectorySerializer(serializers.ModelSerializer):
@@ -200,7 +202,9 @@ def get_parent(self, obj):
     def get_editable(self, obj):
         """Method used by the editable SerializerMethodField"""
         user = self.context['request'].user
-        return user.has_perm('rsr.change_project', obj)
+        if not user.is_authenticated():
+            return False
+        return user.can_edit_project(obj)
 
     class Meta:
         model = Project

diff --git a/akvo/rest/viewsets.py b/akvo/rest/viewsets.py
@@ -172,7 +172,7 @@ def get_queryset(self):
 
     def create(self, request, *args, **kwargs):
         response = super(PublicProjectViewSet, self).create(request, *args, **kwargs)
-        obj = self.queryset.model.objects.get(id=response.data['id'])
+        obj = self.queryset.model.objects.get(pk=response.data['id'])
         project = self.get_project(obj)
         if project is not None:
             project.update_iati_checks()