This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 88916dcf2bb55dd33d7e163bea8618fc69ac27a9
Merge: 91db905659d f992ebb52a5
Author: Daan Hoogland <d...@onecht.net>
AuthorDate: Thu Feb 27 17:10:54 2025 +0100
Merge branch '4.19' into 4.20
.../java/com/cloud/storage/MigrationOptions.java | 11 +++++++++--
.../KvmNonManagedStorageDataMotionStrategy.java | 2 +-
.../motion/StorageSystemDataMotionStrategy.java | 20 ++++++++++++++------
.../kvm/resource/LibvirtComputingResource.java | 4 ++++
.../hypervisor/kvm/storage/KVMStorageProcessor.java | 6 ++++++
ui/src/components/view/InfoCard.vue | 5 +++++
ui/src/components/view/ListView.vue | 8 ++++++--
ui/src/config/section/network.js | 12 +++++++++---
8 files changed, 54 insertions(+), 14 deletions(-)
diff --cc ui/src/components/view/ListView.vue
index 9b5d226289b,8f4e58e93c7..060e09488f3
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@@ -412,8 -382,8 +416,8 @@@
<status :text="record.enabled ? record.enabled.toString() : 'false'"
/>
{{ record.enabled ? 'Enabled' : 'Disabled' }}
</template>
- <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)">
- {{ $toLocaleDate(text) }}
- <template v-if="['created', 'sent', 'allocated'].includes(column.key)">
++ <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)">
+ {{ text && $toLocaleDate(text) }}
</template>
<template v-if="['startdate', 'enddate'].includes(column.key) && ['vm',
'vnfapp'].includes($route.path.split('/')[1])">
{{ getDateAtTimeZone(text, record.timezone) }}
