Commit 090c4e8c authored by Janis Streib's avatar Janis Streib 🦉
Browse files

FIX: no redundant information

parent bfd4b806
Pipeline #117521 passed with stages
in 5 minutes
......@@ -29,24 +29,22 @@ export default {
old: { is_reserved: true, sorting_params_list: ['value'] },
join: { 2: 'api_fkey_dns_ip_addr_subnet' }
},
{ name: 'cntl.mgr2ou.list', join: { 1: 'api_fkey_cntl_mgr2ou_ou' } },
{ name: 'cntl.mgr.list', join: { 4: 'api_fkey_cntl_mgr2ou_mgr' } },
{ name: 'nd.bcd2group.list', join: { 0: 'api_fkey_nd_bcd2group_bcd' } },
{ name: 'cntl.group.list', join: { 6: 'api_fkey_nd_bcd2group_grp' } },
{ name: 'cntl.mgr2group.list', join: { 7: 'api_fkey_cntl_mgr2group_grp' } },
{ name: 'cntl.mgr.list', join: { 8: 'api_fkey_cntl_mgr2group_mgr' } },
{ name: 'cntl.group.list', join: { 4: 'api_fkey_nd_bcd2group_grp' } },
{ name: 'cntl.mgr2group.list', join: { 5: 'api_fkey_cntl_mgr2group_grp' } },
{ name: 'cntl.mgr.list', join: { 6: 'api_fkey_cntl_mgr2group_mgr' } },
{ name: 'nd.ip_route.list', join: { 2: 'api_fkey_nd_ip_route_subnet' } },
{ name: 'dns.ip_addr.list', join: { 2: 'api_fkey_dns_ip_addr_subnet' } },
{ name: 'nd.l_port.list', old: { adm_state: 1 }, join: { 10: 'api_fkey_nd_ip_route_destlp' } },
{ name: 'nd.ip_intf.list', join: { 11: 'api_fkey_nd_ip_intf_addr', 12: 'api_fkey_nd_ip_intf_port' } },
{ name: 'dns.fqdn2group.list', join: { 7: 'api_fkey_dns_fqdn2group_grp' } },
{ name: 'nd.l_port.list', old: { adm_state: 1 }, join: { 8: 'api_fkey_nd_ip_route_destlp' } },
{ name: 'nd.ip_intf.list', join: { 9: 'api_fkey_nd_ip_intf_addr', 10: 'api_fkey_nd_ip_intf_port' } },
{ name: 'dns.fqdn2group.list', join: { 5: 'api_fkey_dns_fqdn2group_grp' } },
{
name: 'org.unit.list',
old_ref: { short_name: { idx: 1, param: 'short_name', allow_no_data: false } },
old: { do_rootpath: true }
},
{ name: 'cntl.mgr2ou.list', join: { 15: 'api_fkey_cntl_mgr2ou_ou' } },
{ name: 'cntl.mgr.list', join: { 16: 'api_fkey_cntl_mgr2ou_mgr' } },
{ name: 'cntl.mgr2ou.list', join: { 13: 'api_fkey_cntl_mgr2ou_ou' } },
{ name: 'cntl.mgr.list', join: { 14: 'api_fkey_cntl_mgr2ou_mgr' } },
{ name: 'nd.vlan.list', join: { 0: 'api_fkey_nd_vlan_bcd' } }
]
return TransactionService.execute(config, ta)
......
......@@ -89,7 +89,7 @@
<b-th>Betreuer/Administratoren</b-th>
<b-td>
<template v-if="parent_ous.length > 0">
Durch übergeordnete OEs:
Durch (übergeordnete) OEs:
<ul>
<li v-for="pou in parent_ous" v-bind:key="pou.short_name">
<b>{{ pou.name }} ({{ pou.short_name }})</b>
......@@ -105,18 +105,6 @@
</li>
</ul>
</template>
<template v-if="oe_mgr.length > 0">
Durch OE:
<ul>
<li v-for="mgr in oe_mgr" v-bind:key="mgr.login_name">
<b-link :href="'mailto:'+mgr.email">
{{ mgr.first_name }}
{{ mgr.last_name }}
</b-link>
({{ mgr.mgr_login_name }})
</li>
</ul>
</template>
Durch Gruppenzuordnungen:
<ul>
<li v-for="grp in bcd_groups" v-bind:key="grp.group_name">
......@@ -345,7 +333,6 @@ export default {
fqdns: null,
groups: null,
gateways: null,
oe_mgr: null,
parent_oe2mgr: null,
parent_oe_mgr: null,
bcd_groups: null,
......@@ -520,17 +507,16 @@ export default {
this.ou = rangeResponse.data[1][0]
this.subnets = rangeResponse.data[2]
this.reserved_addrs = rangeResponse.data[3]
this.oe_mgr = rangeResponse.data[5]
this.bcd_groups = rangeResponse.data[6]
this.group2mgrs = apiutil.dict_of_lists_by_value_of_array(rangeResponse.data[8], 'group_name')
this.group_mgrs = apiutil.dict_by_value_of_array(rangeResponse.data[9], 'login_name')
this.gateways = apiutil.dict_by_value_of_array(rangeResponse.data[13], 'ip_addr')
this.fqdns2group = apiutil.dict_of_lists_by_value_of_array(rangeResponse.data[14], 'group_name')
this.groups = apiutil.dict_by_value_of_array(rangeResponse.data[7], 'name')
this.parent_ous = rangeResponse.data[15]
this.parent_oe2mgr = apiutil.dict_of_lists_by_value_of_array(rangeResponse.data[16], 'ou_short_name')
this.parent_oe_mgr = apiutil.dict_by_value_of_array(rangeResponse.data[17], 'login_name')
this.vlans = rangeResponse.data[18]
this.bcd_groups = rangeResponse.data[4]
this.group2mgrs = apiutil.dict_of_lists_by_value_of_array(rangeResponse.data[6], 'group_name')
this.group_mgrs = apiutil.dict_by_value_of_array(rangeResponse.data[7], 'login_name')
this.gateways = apiutil.dict_by_value_of_array(rangeResponse.data[11], 'ip_addr')
this.fqdns2group = apiutil.dict_of_lists_by_value_of_array(rangeResponse.data[12], 'group_name')
this.groups = apiutil.dict_by_value_of_array(rangeResponse.data[5], 'name')
this.parent_ous = rangeResponse.data[13]
this.parent_oe2mgr = apiutil.dict_of_lists_by_value_of_array(rangeResponse.data[14], 'ou_short_name')
this.parent_oe_mgr = apiutil.dict_by_value_of_array(rangeResponse.data[15], 'login_name')
this.vlans = rangeResponse.data[16]
const recordQuery = await RangeService.getRecords(this.$store.state.netdb_axios_config, this.$route.params.name)
this.fqdns = apiutil.dict_by_value_of_array(recordQuery.data[1], 'value')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment