From 14c7485aa33412832b8eb8bbda71fbf93fd024aa Mon Sep 17 00:00:00 2001
From: Alexander Kaschta <alexander.kaschta9@kit.edu>
Date: Wed, 27 Sep 2023 16:32:26 +0200
Subject: [PATCH] FIX: Replace dict mode with non-dict mode requests
---
json_templates/acme_serviceaccount.json | 38 ++++++++++++-------------
1 file changed, 18 insertions(+), 20 deletions(-)
diff --git a/json_templates/acme_serviceaccount.json b/json_templates/acme_serviceaccount.json
index 6806158..32e66d8 100644
--- a/json_templates/acme_serviceaccount.json
+++ b/json_templates/acme_serviceaccount.json
@@ -59,15 +59,15 @@
"type": "typeahead",
"type_params": {
"query": [
- { "idx": "own_mgr2ou_list", "name": "cntl.mgr2ou.list", "old": { "is_own": true } },
- { "name": "org.unit.list", "inner_join_ref": { "own_mgr2ou_list": "default" }, "old": { "sorting_params_list": ["sub_position"] }},
- { "idx": "unit_list_superset", "name": "org.unit.list", "inner_join_ref": { "unit_list": "api_func_org_unit_is_superset_of_root_node_set" }},
- { "name": "cntl.mgr2ou.list", "inner_join_ref": { "unit_list_superset": "default" } },
- { "name": "cntl.mgr.list", "inner_join_ref": { "mgr2ou_list": "default" } },
- { "name": "dns.fqdn2ou.list", "inner_join_ref": { "unit_list_superset": "default" } },
- { "name": "nd.bcd2ou.list", "inner_join_ref": { "unit_list_superset": "default" } },
- { "name": "nd.bcd.list", "inner_join_ref": { "bcd2ou_list": "default" } },
- { "name": "org.unit_type.list", "inner_join_ref": { "unit_list": "default" } }
+ {"idx":"own_mgr2ou_list","name":"cntl.mgr2ou.list","old":{"is_own":true}},
+ {"idx":"unit_list","name":"org.unit.list","inner_join_ref":{"own_mgr2ou_list":"default"},"old":{"sorting_params_list":["sub_position"]}},
+ {"idx":"unit_list_superset","name":"org.unit.list","inner_join_ref":{"unit_list":"api_func_org_unit_is_superset_of_root_node_set"}},
+ {"idx":"mgr2ou_list","name":"cntl.mgr2ou.list","inner_join_ref":{"unit_list_superset":"default"}},
+ {"idx":"mgr_list","name":"cntl.mgr.list","inner_join_ref":{"mgr2ou_list":"default"}},
+ {"idx":"fqdn2ou_list","name":"dns.fqdn2ou.list","inner_join_ref":{"unit_list_superset":"default"}},
+ {"idx":"bcd2ou_list","name":"nd.bcd2ou.list","inner_join_ref":{"unit_list_superset":"default"}},
+ {"idx":"bcd_list","name":"nd.bcd.list","inner_join_ref":{"bcd2ou_list":"default"}},
+ {"idx":"unit_type_list","name":"org.unit_type.list","inner_join_ref":{"unit_list":"default"}}
],
"query_path": "unit_list_superset",
"display_value": "short_name",
@@ -89,14 +89,14 @@
"type": "typeahead",
"type_params": {
"query": [
- { "name": "cntl.mgr2ou.list", "old": { "is_own": true } },
- { "name": "cntl.mgr2group.list", "old": { "is_own": true } },
- { "name": "org.unit.list", "inner_join_ref": { "mgr2ou_list": "default" } },
- { "name": "cntl.group.list", "inner_join_ref": { "mgr2group_list": "default" } },
- { "name": "dns.fqdn2ou.list", "inner_join_ref": { "unit_list": "default"} },
- { "name": "dns.fqdn2group.list", "inner_join_ref": { "group_list": "default"} },
- { "idx": "ou_fqdns", "name": "dns.fqdn.list", "inner_join_ref": { "fqdn2ou_list": "default" } },
- { "idx": "group_fqdns", "name": "dns.fqdn.list", "inner_join_ref": { "fqdn2group_list": "default" } }
+ {"idx":"mgr2ou_list","name":"cntl.mgr2ou.list","old":{"is_own":true}},
+ {"idx":"mgr2group_list","name":"cntl.mgr2group.list","old":{"is_own":true}},
+ {"idx":"unit_list","name":"org.unit.list","inner_join_ref":{"mgr2ou_list":"default"}},
+ {"idx":"group_list","name":"cntl.group.list","inner_join_ref":{"mgr2group_list":"default"}},
+ {"idx":"fqdn2ou_list","name":"dns.fqdn2ou.list","inner_join_ref":{"unit_list":"default"}},
+ {"idx":"fqdn2group_list","name":"dns.fqdn2group.list","inner_join_ref":{"group_list":"default"}},
+ {"idx":"ou_fqdns","name":"dns.fqdn.list","inner_join_ref":{"fqdn2ou_list":"default"}},
+ {"idx":"group_fqdns","name":"dns.fqdn.list","inner_join_ref":{"fqdn2group_list":"default"}}
],
"query_path": "group_fqdns",
"display_value": "value",
@@ -118,9 +118,7 @@
},
"type": "typeahead",
"type_params": {
- "query": [
- { "idx": "svc_managers", "name": "cntl.mgr.list", "old": { "is_own": true } }
- ],
+ "query": [{"idx":"svc_managers","name":"cntl.mgr.list","old":{"is_own":true}}],
"query_path": "svc_managers",
"display_value": "login_name",
"return_value": "login_name"
--
GitLab