Merge pull request #1572 from IFRCGo/feature/revoke-omnipotenty-from-ifrc-admins-on-per

Revoke full permission from ifrc_admin

Author: szabozoltan69

per/admin_classes.py

@@ -26,7 +26,6 @@ def get_request_user_regions(self, request):
 
     def get_filtered_queryset(self, request, queryset, dispatch):
         if request.user.is_superuser \
-                or request.user.has_perm('api.ifrc_admin') \
                 or request.user.has_perm('api.per_core_admin'):
             return queryset
         countries, regions = self.get_request_user_regions(request)

per/drf_views.py

@@ -574,7 +574,6 @@ def get(self, request):
 
         # Check if the User has permissions to update
         if not request.user.is_superuser \
-                and not request.user.has_perm('api.ifrc_admin') \
                 and not request.user.has_perm('api.per_core_admin'):
             countries, regions = self.get_request_user_regions(request)
 

per/views.py

@@ -85,7 +85,6 @@ def post(self, request):
 
         # Check if the User has permissions to update
         if not request.user.is_superuser \
-                and not request.user.has_perm('api.ifrc_admin') \
                 and not request.user.has_perm('api.per_core_admin'):
             countries, regions = self.get_request_user_regions(request)
             # These need to be strings
@@ -154,7 +153,6 @@ def post(self, request):
 
         # Check if the User has permissions to update
         if not request.user.is_superuser \
-                and not request.user.has_perm('api.ifrc_admin') \
                 and not request.user.has_perm('api.per_core_admin'):
             countries, regions = self.get_request_user_regions(request)
             overview_id = forms[list(forms.keys())[0]]['overview']['id']
@@ -326,7 +324,6 @@ def post(self, request):
 
         # Check if the User has permissions to create
         if not request.user.is_superuser \
-                and not request.user.has_perm('api.ifrc_admin') \
                 and not request.user.has_perm('api.per_core_admin'):
             countries, regions = self.get_request_user_regions(request)
             country = Country.objects.filter(id=country_id).first() if country_id else None
@@ -446,7 +443,6 @@ def post(self, request):
 
         # Check if the User has permissions to update
         if not request.user.is_superuser \
-                and not request.user.has_perm('api.ifrc_admin') \
                 and not request.user.has_perm('api.per_core_admin'):
             countries, regions = self.get_request_user_regions(request)
             country = Country.objects.filter(id=country_id).first() if country_id else None