Merge pull request #807 from LukeTapekhin/heavy_refactor

delete roles fixes
ispras · Sep 5, 2017 · 97d67e9 · 97d67e9
2 parents 07213dc + e67eea1
commit 97d67e9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/lingvodoc/views/v2/dictionary.py b/lingvodoc/views/v2/dictionary.py
@@ -596,9 +596,6 @@ def edit_dictionary_roles(request):  # tested & in docs
     client_id = request.matchdict.get('client_id')
     object_id = request.matchdict.get('object_id')
 
-
-
-
     url = request.route_url('dictionary_roles',
                             client_id=client_id,
                             object_id=object_id)
@@ -608,7 +605,6 @@ def edit_dictionary_roles(request):  # tested & in docs
     subreq.headers = headers
     previous = request.invoke_subrequest(subreq).json_body
 
-
     if type(request.json_body) == str:
         req = json.loads(request.json_body)
     else:
@@ -649,7 +645,10 @@ def edit_dictionary_roles(request):  # tested & in docs
         subreq.method = 'PATCH'
         headers = {'Cookie': request.headers['Cookie']}
         subreq.headers = headers
-        request.invoke_subrequest(subreq)
+        response = request.invoke_subrequest(subreq)
+        # if response.status_code != 200:
+        #     request.response = response
+        #     return response.json_body
     roles_users = None
     if 'roles_users' in req:
         roles_users = req['roles_users']
@@ -757,7 +756,6 @@ def delete_dictionary_roles(request):  # & in docs
         req = json.loads(request.json_body)
     else:
         req = request.json_body
-    print(req)
 
     roles_users = None
     if 'roles_users' in req:
@@ -808,8 +806,9 @@ def delete_dictionary_roles(request):  # & in docs
                                 if user in group.users:
                                     group.users.remove(user)
                     else:
-                        request.response.status = HTTPForbidden.code
-                        return {'error': str("Not enough permission")}
+                        if roles_users[role_name]:
+                            request.response.status = HTTPForbidden.code
+                            return {'error': str("Not enough permission")}
 
             if roles_organizations:
                 for role_name in roles_organizations:
@@ -848,8 +847,9 @@ def delete_dictionary_roles(request):  # & in docs
                                 if org in group.organizations:
                                     group.organizations.remove(org)
                     else:
-                        request.response.status = HTTPForbidden.code
-                        return {'error': str("Not enough permission")}
+                        if roles_organizations[role_name]:
+                            request.response.status = HTTPForbidden.code
+                            return {'error': str("Not enough permission")}
 
             request.response.status = HTTPOk.code
             return response

diff --git a/lingvodoc/views/v2/perspective/views.py b/lingvodoc/views/v2/perspective/views.py
@@ -1015,8 +1015,6 @@ def edit_perspective_roles(request):
     parent_client_id = request.matchdict.get('client_id')
     parent_object_id = request.matchdict.get('object_id')
 
-
-
     url = request.route_url('perspective_roles',
                             client_id=parent_client_id,
                             object_id=parent_object_id,
@@ -1028,13 +1026,11 @@ def edit_perspective_roles(request):
     subreq.headers = headers
     previous = request.invoke_subrequest(subreq).json_body
 
-
     if type(request.json_body) == str:
         req = json.loads(request.json_body)
     else:
         req = request.json_body
 
-
     for role_name in req['roles_users']:
         remove_list = list()
         for user in req['roles_users'][role_name]:
@@ -1053,7 +1049,6 @@ def edit_perspective_roles(request):
         for user in remove_list:
             req['roles_users'][role_name].remove(user)
 
-
     delete_flag = False
 
     for role_name in previous['roles_users']:
@@ -1240,8 +1235,9 @@ def delete_perspective_roles(request):  # TODO: test
                                 if user in group.users:
                                     group.users.remove(user)
                     else:
-                        request.response.status = HTTPForbidden.code
-                        return {'error': str("Not enough permission")}
+                        if roles_users[role_name]:
+                            request.response.status = HTTPForbidden.code
+                            return {'error': str("Not enough permission")}
 
             if roles_organizations:
                 for role_name in roles_organizations:
@@ -1279,8 +1275,9 @@ def delete_perspective_roles(request):  # TODO: test
                                 if org in group.organizations:
                                     group.organizations.remove(org)
                     else:
-                        request.response.status = HTTPForbidden.code
-                        return {'error': str("Not enough permission")}
+                        if roles_organizations[role_name]:
+                            request.response.status = HTTPForbidden.code
+                            return {'error': str("Not enough permission")}
 
             request.response.status = HTTPOk.code
             return response