This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.19 by this push:
new 0204cb75e37 ui: show guest networks for guest vlans list (#9554)
0204cb75e37 is described below
commit 0204cb75e371770085c09dc48d95ec2c10010d61
Author: Abhishek Kumar <[email protected]>
AuthorDate: Thu Aug 29 18:45:33 2024 +0530
ui: show guest networks for guest vlans list (#9554)
Signed-off-by: Abhishek Kumar <[email protected]>
---
ui/src/components/view/ListView.vue | 6 ++++++
ui/src/config/section/network.js | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ui/src/components/view/ListView.vue
b/ui/src/components/view/ListView.vue
index ff2e385f03c..087c547aa69 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -240,6 +240,12 @@
<template v-if="column.key === 'guestnetworkname'">
<router-link :to="{ path: '/guestnetwork/' + record.guestnetworkid
}">{{ text }}</router-link>
</template>
+ <template v-if="column.key === 'guest.networks' && record.network">
+ <template v-for="(item, idx) in record.network" :key="idx">
+ <router-link :to="{ path: '/guestnetwork/' + item.id }">{{ item.name
}}</router-link>
+ <span v-if="idx < (record.network.length - 1)">, </span>
+ </template>
+ </template>
<template v-if="column.key === 'associatednetworkname'">
<router-link :to="{ path: '/guestnetwork/' +
record.associatednetworkid }">{{ text }}</router-link>
</template>
diff --git a/ui/src/config/section/network.js b/ui/src/config/section/network.js
index 8399d9769ef..fd1b15557af 100644
--- a/ui/src/config/section/network.js
+++ b/ui/src/config/section/network.js
@@ -1364,7 +1364,7 @@ export default {
permission: ['listGuestVlans'],
resourceType: 'GuestVlan',
filters: ['allocatedonly', 'all'],
- columns: ['vlan', 'allocationstate', 'physicalnetworkname', 'taken',
'account', 'project', 'domain', 'zonename'],
+ columns: ['vlan', 'allocationstate', 'physicalnetworkname', 'taken',
'account', 'project', 'domain', 'zonename', 'guest.networks'],
details: ['vlan', 'allocationstate', 'physicalnetworkname', 'taken',
'account', 'project', 'domain', 'isdedicated', 'zonename'],
searchFilters: ['zoneid'],
tabs: [{
