Merge pull request #1574 from IFRCGo/develop

PER permissions revoke from ifrc_admins

Author: szabozoltan69

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.1.459
+
+### Added
+ - PER permissions revoke from ifrc_admins
+
 ## 1.1.458
 
 ### Added
@@ -2079,7 +2084,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## 0.1.20
 
-[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.458...HEAD
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.459...HEAD
+[1.1.459]: https://github.com/IFRCGo/go-api/compare/1.1.458...1.1.459
 [1.1.458]: https://github.com/IFRCGo/go-api/compare/1.1.457...1.1.458
 [1.1.457]: https://github.com/IFRCGo/go-api/compare/1.1.456...1.1.457
 [1.1.456]: https://github.com/IFRCGo/go-api/compare/1.1.455...1.1.456

main/__init__.py

@@ -3,4 +3,4 @@
 from .celery import app as celery_app
 
 __all__ = ['celery_app']
-__version__ = '1.1.458'
+__version__ = '1.1.459'

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