X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fadmin_topics.py;h=bc2c7d93e76fbdad0afa8b3e90108bbb39b321fa;hp=77b968869c5b5b52e82a3a35c29f16a164b462b7;hb=f269fa5cd7c46515aab49ad8af6da7e918afa592;hpb=a16a4facd05265ade1bc8cdae2c796ef13e30786

diff --git a/osm_nbi/admin_topics.py b/osm_nbi/admin_topics.py
index 77b9688..bc2c7d9 100644
--- a/osm_nbi/admin_topics.py
+++ b/osm_nbi/admin_topics.py
@@ -478,7 +478,7 @@ class UserTopicAuth(UserTopic):
 
         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
@@ -569,15 +569,15 @@ class UserTopicAuth(UserTopic):
                 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"]
@@ -751,7 +751,7 @@ class RoleTopicAuth(BaseTopic):
         :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
@@ -862,13 +862,20 @@ class RoleTopicAuth(BaseTopic):
         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
@@ -892,8 +899,12 @@ class RoleTopicAuth(BaseTopic):
         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):
@@ -906,6 +917,8 @@ class RoleTopicAuth(BaseTopic):
         """
         content_keys = list(content.keys())
 
+        content["_id"] = str(content["_id"])
+
         for key in content_keys:
             if ":" in key:
                 content[key.replace(":", ".")] = content[key]
@@ -919,7 +932,7 @@ class RoleTopicAuth(BaseTopic):
         :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)
@@ -939,6 +952,17 @@ class RoleTopicAuth(BaseTopic):
         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 = []