This is an automated email from the ASF dual-hosted git repository. weizhou 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 8db248e4b40 UI: Move templates creation date to the Zones tab (#10709) 8db248e4b40 is described below commit 8db248e4b40b96c0f70a4eaaf41848087d1f24ca Author: Nicolas Vazquez <nicovazque...@gmail.com> AuthorDate: Thu Apr 17 04:54:11 2025 -0300 UI: Move templates creation date to the Zones tab (#10709) * UI: Move templates creation date to the Zones tab * Extend changes to ISOs --- ui/src/components/view/InfoCard.vue | 4 ++-- ui/src/views/image/IsoZones.vue | 8 ++++++++ ui/src/views/image/TemplateZones.vue | 8 ++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue index d805f7b2719..00cb4748a88 100644 --- a/ui/src/components/view/InfoCard.vue +++ b/ui/src/components/view/InfoCard.vue @@ -629,7 +629,7 @@ <span v-else>{{ resource.podname || resource.pod || resource.podid }}</span> </div> </div> - <div class="resource-detail-item" v-if="resource.zoneid"> + <div class="resource-detail-item" v-if="resource.zoneid && !['template', 'iso'].includes($route.path.split('/')[1])"> <div class="resource-detail-item__label">{{ $t('label.zone') }}</div> <div class="resource-detail-item__details"> <span v-if="images.zone"> @@ -700,7 +700,7 @@ <span v-else>{{ resource.managementserver || resource.managementserverid }}</span> </div> </div> - <div class="resource-detail-item" v-if="resource.created"> + <div class="resource-detail-item" v-if="resource.created && !['template', 'iso'].includes($route.path.split('/')[1])"> <div class="resource-detail-item__label">{{ $t('label.created') }}</div> <div class="resource-detail-item__details"> <calendar-outlined />{{ $toLocaleDate(resource.created) }} diff --git a/ui/src/views/image/IsoZones.vue b/ui/src/views/image/IsoZones.vue index daf1e7e21e0..75eac8fd97f 100644 --- a/ui/src/views/image/IsoZones.vue +++ b/ui/src/views/image/IsoZones.vue @@ -48,6 +48,9 @@ <span v-if="record.isready">{{ $t('label.yes') }}</span> <span v-else>{{ $t('label.no') }}</span> </template> + <template v-else-if="column.key === 'created'"> + <span v-if="record.created">{{ $toLocaleDate(record.created) }}</span> + </template> <template v-if="column.key === 'actions'"> <span style="margin-right: 5px"> <tooltip-button @@ -262,6 +265,11 @@ export default { title: this.$t('label.zonename'), dataIndex: 'zonename' }, + { + key: 'created', + title: this.$t('label.created'), + dataIndex: 'created' + }, { title: this.$t('label.status'), dataIndex: 'status' diff --git a/ui/src/views/image/TemplateZones.vue b/ui/src/views/image/TemplateZones.vue index 3507bc897a1..655e43c9155 100644 --- a/ui/src/views/image/TemplateZones.vue +++ b/ui/src/views/image/TemplateZones.vue @@ -48,6 +48,9 @@ <span v-if="record.isready">{{ $t('label.yes') }}</span> <span v-else>{{ $t('label.no') }}</span> </template> + <template v-else-if="column.key === 'created'"> + <span v-if="record.created">{{ $toLocaleDate(record.created) }}</span> + </template> <template v-if="column.key === 'actions'"> <tooltip-button style="margin-right: 5px" @@ -308,6 +311,11 @@ export default { title: this.$t('label.zonename'), dataIndex: 'zonename' }, + { + key: 'created', + title: this.$t('label.created'), + dataIndex: 'created' + }, { title: this.$t('label.status'), dataIndex: 'status'