Skip to content

Commit 9cc8435

Browse files
committed
Revert "UI: Fixes and minor enhacements to the Public IP Addresses section (apache#10351)"
This reverts commit f3b2c9c.
1 parent f3b2c9c commit 9cc8435

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

ui/src/components/view/ListView.vue

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,6 @@
163163
 
164164
<a-tag>static-nat</a-tag>
165165
</span>
166-
<span v-if="record.issystem">
167-
&nbsp;
168-
<a-tag>system</a-tag>
169-
</span>
170166
</template>
171167
<template v-if="column.key === 'ip6address'" href="javascript:;">
172168
<span>{{ ipV6Address(text, record) }}</span>
@@ -442,8 +438,8 @@
442438
<status :text="record.enabled ? record.enabled.toString() : 'false'" />
443439
{{ record.enabled ? 'Enabled' : 'Disabled' }}
444440
</template>
445-
<template v-if="['created', 'sent', 'removed', 'effectiveDate', 'endDate', 'allocated'].includes(column.key) || (['startdate'].includes(column.key) && ['webhook'].includes($route.path.split('/')[1])) || (column.key === 'allocated' && ['asnumbers', 'publicip', 'ipv4subnets'].includes($route.meta.name) && text)">
446-
{{ text && $toLocaleDate(text) }}
441+
<template v-if="['created', 'sent', 'removed', 'effectiveDate', 'endDate'].includes(column.key) || (['startdate'].includes(column.key) && ['webhook'].includes($route.path.split('/')[1])) || (column.key === 'allocated' && ['asnumbers', 'publicip', 'ipv4subnets'].includes($route.meta.name) && text)">
442+
{{ $toLocaleDate(text) }}
447443
</template>
448444
<template v-if="['startdate', 'enddate'].includes(column.key) && ['vm', 'vnfapp'].includes($route.path.split('/')[1])">
449445
{{ getDateAtTimeZone(text, record.timezone) }}

ui/src/config/section/network.js

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -841,13 +841,10 @@ export default {
841841
message: 'message.action.release.ip',
842842
docHelp: 'adminguide/networking_and_traffic.html#releasing-an-ip-address-alloted-to-a-vpc',
843843
dataView: true,
844-
show: (record) => { return record.state === 'Allocated' && !record.issourcenat && !record.issystem },
844+
show: (record) => { return record.state === 'Allocated' && !record.issourcenat },
845845
groupAction: true,
846846
popup: true,
847-
groupMap: (selection) => { return selection.map(x => { return { id: x } }) },
848-
groupShow: (selectedIps) => {
849-
return selectedIps.every((ip) => ip.state === 'Allocated' && !ip.issourcenat && !ip.issystem)
850-
}
847+
groupMap: (selection) => { return selection.map(x => { return { id: x } }) }
851848
},
852849
{
853850
api: 'reserveIpAddress',
@@ -867,10 +864,7 @@ export default {
867864
show: (record) => { return record.state === 'Reserved' },
868865
groupAction: true,
869866
popup: true,
870-
groupMap: (selection) => { return selection.map(x => { return { id: x } }) },
871-
groupShow: (selectedIps) => {
872-
return selectedIps.every((ip) => ip.state === 'Reserved')
873-
}
867+
groupMap: (selection) => { return selection.map(x => { return { id: x } }) }
874868
}
875869
]
876870
},

0 commit comments

Comments
 (0)