Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
scc-net
netvs
netvs-core
Commits
68b72c0c
Commit
68b72c0c
authored
Jan 28, 2021
by
janis.streib
🦉
Browse files
UPD: (for future use): hide blaming-badge on dhcp pool addresses
parent
e9dc1443
Pipeline
#130393
passed with stages
in 4 minutes and 21 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
frontend/src/api-services/dns_bcd.service.js
View file @
68b72c0c
...
...
@@ -23,7 +23,11 @@ export default {
const
ta
=
[
{
name
:
'
nd.bcd.list
'
,
old
:
{
name_list
:
[
name
]
}
},
{
name
:
'
org.unit.list
'
,
join
:
{
0
:
'
api_fkey_nd_bcd_ou
'
}
},
{
name
:
'
nd.ip_subnet.list
'
,
join
:
{
0
:
'
api_fkey_nd_ip_subnet_bcd
'
},
old
:
{
sorting_params_list
:
[
'
type ASC
'
,
'
cidr ASC
'
]
}
},
{
name
:
'
nd.ip_subnet.list
'
,
join
:
{
0
:
'
api_fkey_nd_ip_subnet_bcd
'
},
old
:
{
sorting_params_list
:
[
'
type ASC
'
,
'
cidr ASC
'
]
}
},
{
name
:
'
dns.ip_addr.list
'
,
old
:
{
is_reserved
:
true
,
sorting_params_list
:
[
'
value
'
]
},
...
...
@@ -40,7 +44,7 @@ export default {
{
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
:
true
}
},
old_ref
:
{
short_name
:
{
idx
:
1
,
param
:
'
short_name
'
,
allow_no_data
:
true
}
},
old
:
{
do_rootpath
:
true
}
},
{
name
:
'
cntl.mgr2ou.list
'
,
join
:
{
13
:
'
api_fkey_cntl_mgr2ou_ou
'
}
},
...
...
@@ -61,7 +65,8 @@ export default {
{
name
:
'
dns.fqdn.list
'
,
join
:
{
0
:
'
api_fkey_dns_record_fqdn
'
}
},
{
name
:
'
dnscfg.record_inttype.list
'
,
old
:
{
is_own
:
true
,
sorting_params_list
:
[
'
record_type
'
]
}
},
{
name
:
'
dnscfg.record_type.list
'
},
{
name
:
'
dnscfg.fqdn_type.list
'
,
old
:
{
sorting_params_list
:
[
'
position
'
]
}
}
{
name
:
'
dnscfg.fqdn_type.list
'
,
old
:
{
sorting_params_list
:
[
'
position
'
]
}
},
{
name
:
'
dns.ip_addr.list
'
,
old
:
{
type
:
'
4
'
,
is_dhcp
:
true
},
join
:
{
0
:
'
api_fkey_dns_record_target_ipaddr
'
}
}
]
return
TransactionService
.
execute
(
config
,
ta
)
}
...
...
frontend/src/views/dnsvs/BCDRecords.vue
View file @
68b72c0c
...
...
@@ -319,7 +319,7 @@
</b-td>
<b-td>
<RRDataView
:item=
"item"
></RRDataView>
<b-badge
href=
"#"
@
click=
"createItem('AAAA', '', item.fqdn)"
v-if=
"bcd_is_dual_stack && record_type == 'A' && !fqdnHasAAAA(item.fqdn)"
variant=
"danger"
>
Kein
<b-badge
href=
"#"
@
click=
"createItem('AAAA', '', item.fqdn)"
v-if=
"bcd_is_dual_stack && record_type == 'A' &&
!(item.target_ipaddr in dhcp_ip_addrs) &&
!fqdnHasAAAA(item.fqdn)"
variant=
"danger"
>
Kein
AAAA-Record!
</b-badge>
</b-td>
...
...
@@ -463,6 +463,7 @@ export default {
record_types
:
null
,
record_types_by_name
:
null
,
collapse_states
:
[
true
],
dhcp_ip_addrs
:
{},
reserved_addrs_list_fields
:
[
{
label
:
'
Adresse
'
,
...
...
@@ -746,6 +747,7 @@ export default {
}
this
.
records
=
apiutil
.
dict_of_lists_by_value_of_array
(
recordQuery
.
data
[
0
],
'
type
'
)
this
.
records_by_fqdn
=
apiutil
.
dict_of_lists_by_value_of_array
(
recordQuery
.
data
[
0
],
'
fqdn
'
)
this
.
dhcp_ip_addrs
=
apiutil
.
dict_by_value_of_array
(
recordQuery
.
data
[
0
],
'
value
'
)
for
(
const
t
of
Object
.
keys
(
this
.
records
))
{
this
.
$root
.
$set
(
this
.
sort_by
,
t
,
'
data
'
)
this
.
$root
.
$set
(
this
.
sort_dir
,
t
,
'
ascending
'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment