for project in content["projects"]:
for role in project["roles"]:
- project_role_mappings.append([project, role])
+ project_role_mappings.append({"project": project, "role": role})
del content["projects"]
content["project_role_mappings"] = project_role_mappings
for mapping in mappings_to_remove:
self.auth.remove_role_from_user(
user["name"],
- mapping[0],
- mapping[1]
+ mapping["project"],
+ mapping["role"]
)
for mapping in mappings_to_add:
self.auth.assign_role_to_user(
user["name"],
- mapping[0],
- mapping[1]
+ mapping["project"],
+ mapping["role"]
)
return content["_id"]
:param role_definitions: role definition to test
:return: None if ok, raises ValidationError exception on error
"""
- ignore_fields = ["_id", "name"]
+ ignore_fields = ["_id", "_admin", "name"]
for role_def in role_definitions.keys():
if role_def in ignore_fields:
continue
if not content["_admin"].get("created"):
content["_admin"]["created"] = now
content["_admin"]["modified"] = now
- content[":"] = False
+
+ if "." in content.keys():
+ content["root"] = content["."]
+ del content["."]
+
+ if "root" not in content.keys():
+ content["root"] = False
ignore_fields = ["_id", "_admin", "name"]
- for role_def, value in content.items():
+ content_keys = content.keys()
+ for role_def in content_keys:
if role_def in ignore_fields:
continue
- content[role_def.replace(".", ":")] = value
+ content[role_def.replace(".", ":")] = content[role_def]
del content[role_def]
@staticmethod
for role_def, value in edit_content.items():
final_content[role_def.replace(".", ":")] = value
- if ":" not in final_content.keys():
- final_content[":"] = False
+ if ":" in final_content.keys():
+ final_content["root"] = final_content[":"]
+ del final_content[":"]
+
+ if "root" not in final_content.keys():
+ final_content["root"] = False
@staticmethod
def format_on_show(content):
"""
content_keys = list(content.keys())
+ content["_id"] = str(content["_id"])
+
for key in content_keys:
if ":" in key:
content[key.replace(":", ".")] = content[key]
:param _id: server internal id
:return: dictionary, raise exception if not found.
"""
- filter_db = self._get_project_filter(session, write=False, show_all=True)
+ filter_db = self._get_project_filter(session)
filter_db["_id"] = _id
role = self.db.get_one(self.topic, filter_db)
if not filter_q:
filter_q = {}
+ if "root" in filter_q:
+ filter_q[":"] = filter_q["root"]
+ del filter_q["root"]
+
+ if len(filter_q) > 0:
+ keys = [key for key in filter_q.keys() if "." in key]
+
+ for key in keys:
+ filter_q[key.replace(".", ":")] = filter_q[key]
+ del filter_q[key]
+
roles = self.db.get_list(self.topic, filter_q)
new_roles = []