etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'apache/4.17' into 4.18

This commit is contained in:
Abhishek Kumar 2023-04-11 15:32:20 +05:30
parent 6886fca105 55e35c6e0c
commit d1707009f6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/src/config/section/network.js
View File

@ -655,9 +655,8 @@ export default {
{
name: 'vpnuser',
title: 'label.vpn.users',
icon: 'user-alt-outlined',
icon: 'user-switch-outlined',
permission: ['listVpnUsers'],
hidden: true,
columns: ['username', 'state', 'account', 'domain'],
details: ['username', 'state', 'account', 'domain'],
actions: [

2
ui/src/core/lazy_lib/icons_use.js
View File

@ -160,6 +160,7 @@ import {
UserDeleteOutlined,
UsergroupDeleteOutlined,
UserOutlined,
UserSwitchOutlined,
UploadOutlined,
WarningOutlined,
WifiOutlined,
@ -313,6 +314,7 @@ export default {
app.component('UserDeleteOutlined', UserDeleteOutlined)
app.component('UsergroupDeleteOutlined', UsergroupDeleteOutlined)
app.component('UserOutlined', UserOutlined)
app.component('UserSwitchOutlined', UserSwitchOutlined)
app.component('UploadOutlined', UploadOutlined)
app.component('WarningOutlined', WarningOutlined)
app.component('WifiOutlined', WifiOutlined)