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
1e474631
Commit
1e474631
authored
Oct 12, 2020
by
janis.streib
🦉
Browse files
UPD: optiomized api service and show subgroups
parent
f0dfebc7
Pipeline
#112416
passed with stages
in 9 minutes and 3 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
frontend/src/api-services/groups.service.js
View file @
1e474631
...
...
@@ -7,7 +7,6 @@ export default {
{
name
:
'
cntl.mgr2group.list
'
,
join
:
{
0
:
'
api_fkey_cntl_mgr2group_grp
'
}
},
{
name
:
'
nd.bcd2group.list
'
,
join
:
{
0
:
'
api_fkey_nd_bcd2group_grp
'
}
},
{
name
:
'
dns.fqdn2group.list
'
,
join
:
{
0
:
'
api_fkey_dns_fqdn2group_grp
'
}
},
{
name
:
'
dns.fqdn.list
'
,
join
:
{
3
:
'
api_fkey_dns_fqdn2group_fqdn
'
}
},
{
name
:
'
cntl.mgr.list
'
,
join
:
{
1
:
'
api_fkey_cntl_mgr2group_mgr
'
}
},
{
name
:
'
nd.bcd.list
'
,
join
:
{
2
:
'
api_fkey_nd_bcd2group_bcd
'
}
}
]
...
...
frontend/src/views/cntl/Groups.vue
View file @
1e474631
...
...
@@ -49,6 +49,14 @@
</
template
>
</b-table>
</b-collapse>
<b-button
block
squared
variant=
"outline-secondary"
v-b-toggle=
"group.name + '-collapse-subgroups'"
>
Untergruppen
<br/>
<font-awesome-icon
class=
"collapse-icon"
:icon=
"['fas','chevron-down']"
/>
</b-button>
<b-collapse
:id=
"group.name + '-collapse-subgroups'"
>
<b-table
:items=
"groups_by_parent[group.name]"
>
</b-table>
</b-collapse>
</b-card>
</template>
</Loading>
...
...
@@ -71,6 +79,7 @@ export default {
fqdn2grp
:
null
,
groups
:
null
,
ous
:
null
,
groups_by_parent
:
null
,
mgr_list_fields
:
[
{
key
:
'
mgr_login_name
'
,
...
...
@@ -108,7 +117,9 @@ export default {
this
.
bcds2grp
=
apiutil
.
dict_of_lists_by_value_of_array
(
res
[
2
],
'
group_name
'
)
this
.
mgrs2grp
=
apiutil
.
dict_of_lists_by_value_of_array
(
res
[
1
],
'
group_name
'
)
this
.
fqdn2grp
=
apiutil
.
dict_of_lists_by_value_of_array
(
res
[
3
],
'
group_name
'
)
this
.
mgrs
=
apiutil
.
dict_by_value_of_array
(
res
[
5
],
'
login_name
'
)
this
.
mgrs
=
apiutil
.
dict_by_value_of_array
(
res
[
4
],
'
login_name
'
)
const
subgroups
=
res
[
0
].
filter
(
group
=>
group
.
is_sub_group
)
this
.
groups_by_parent
=
apiutil
.
dict_of_lists_by_value_of_array
(
subgroups
,
'
parent_name
'
)
}
},
async
mounted
()
{
...
...
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