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.18'

This commit is contained in:
Abhishek Kumar 2023-12-06 18:27:35 +05:30
parent a6b570845f 4c91cc7c6f
commit b00fd6bb4d
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/public/locales/en.json
View File

@ -1071,6 +1071,7 @@
"label.ipv6.dns1": "IPv6 DNS1",
"label.ipv6.dns2": "IPv6 DNS2",
"label.ipv6.subnets": "IPv6 Subnets",
"label.ip.addresses": "IP Addresses",
"label.iqn": "Target IQN",
"label.is.in.progress": "is in progress",
"label.is.shared": "Is shared",

8
ui/src/components/view/ResourceView.vue
View File

@ -44,7 +44,7 @@
<template v-for="tab in tabs" :key="tab.name">
<a-tab-pane
:key="tab.name"
:tab="$t('label.' + tab.name)"
:tab="$t('label.' + tabName(tab))"
v-if="showTab(tab)">
<keep-alive>
<component
@ -158,6 +158,12 @@ export default {
)
this.$emit('onTabChange', key)
},
tabName (tab) {
if (typeof tab.name === 'function') {
return tab.name(this.resource)
}
return tab.name
},
showTab (tab) {
if (this.networkService && this.networkService.service && tab.networkServiceFilter) {
return tab.networkServiceFilter(this.networkService.service)

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

@ -66,7 +66,7 @@ export default {
component: shallowRef(defineAsyncComponent(() => import('@/views/network/Ipv6FirewallRulesTab.vue'))),
show: (record, route, user) => { return record.type === 'Isolated' && ['IPv6', 'DualStack'].includes(record.internetprotocol) && !('vpcid' in record) && 'listIpv6FirewallRules' in store.getters.apis && (['Admin', 'DomainAdmin'].includes(user.roletype) || record.account === user.account || record.projectid) }
}, {
name: 'public.ip.addresses',
name: (record) => { return record.type === 'Shared' ? 'ip.addresses' : 'public.ip.addresses' },
component: shallowRef(defineAsyncComponent(() => import('@/views/network/IpAddressesTab.vue'))),
show: (record, route, user) => { return 'listPublicIpAddresses' in store.getters.apis && (record.type === 'Shared' || (record.type === 'Isolated' && !('vpcname' in record) && (['Admin', 'DomainAdmin'].includes(user.roletype) || record.account === user.account || record.projectid))) }
}, {