Merge branch 'dev' of https://github.com/Crystal-SDS/controller into dev

Conflicts: api/policies/views.py
Crystal-SDS · Oct 31, 2017 · 3ffec77 · 3ffec77
2 parents 8fead17 + 4d7de57
commit 3ffec77
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/api/policies/views.py b/api/policies/views.py
@@ -559,11 +559,13 @@ def access_control_detail(request, policy_id):
             r.hdel("acl:" + str(target_id), acl_id)
         except DataError:
             return JSONResponse("Error retrieving policy", status=400)
+
         return JSONResponse("Access policy correctly removed", status=status.HTTP_200_OK)
 
     if request.method == 'PUT':
         data = JSONParser().parse(request)
         try:
+
             policy_redis = r.hget("acl:" + str(target_id), acl_id)
             policy = json.loads(policy_redis)
             policy.update(data)