Skip to content

Commit a554edf

Browse files
nvazquezdhslove
authored andcommitted
UI: Move templates creation date to the Zones tab (apache#10709)
* UI: Move templates creation date to the Zones tab * Extend changes to ISOs
1 parent 7d84ead commit a554edf

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

ui/src/components/view/InfoCard.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@
691691
<span v-else>{{ resource.podname || resource.pod || resource.podid }}</span>
692692
</div>
693693
</div>
694-
<div class="resource-detail-item" v-if="resource.zoneid">
694+
<div class="resource-detail-item" v-if="resource.zoneid && !['template', 'iso'].includes($route.path.split('/')[1])">
695695
<div class="resource-detail-item__label">{{ $t('label.zone') }}</div>
696696
<div class="resource-detail-item__details">
697697
<span v-if="images.zone">
@@ -778,7 +778,7 @@
778778
<span v-else>{{ resource.managementserver || resource.managementserverid }}</span>
779779
</div>
780780
</div>
781-
<div class="resource-detail-item" v-if="resource.created">
781+
<div class="resource-detail-item" v-if="resource.created && !['template', 'iso'].includes($route.path.split('/')[1])">
782782
<div class="resource-detail-item__label">{{ $t('label.created') }}</div>
783783
<div class="resource-detail-item__details">
784784
<calendar-outlined />{{ $toLocaleDate(resource.created) }}

ui/src/views/image/IsoZones.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@
4848
<span v-if="record.isready">{{ $t('label.yes') }}</span>
4949
<span v-else>{{ $t('label.no') }}</span>
5050
</template>
51+
<template v-else-if="column.key === 'created'">
52+
<span v-if="record.created">{{ $toLocaleDate(record.created) }}</span>
53+
</template>
5154
<template v-if="column.key === 'actions'">
5255
<span style="margin-right: 5px">
5356
<tooltip-button
@@ -262,6 +265,11 @@ export default {
262265
title: this.$t('label.zonename'),
263266
dataIndex: 'zonename'
264267
},
268+
{
269+
key: 'created',
270+
title: this.$t('label.created'),
271+
dataIndex: 'created'
272+
},
265273
{
266274
title: this.$t('label.status'),
267275
dataIndex: 'status'

ui/src/views/image/TemplateZones.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@
4848
<span v-if="record.isready">{{ $t('label.yes') }}</span>
4949
<span v-else>{{ $t('label.no') }}</span>
5050
</template>
51+
<template v-else-if="column.key === 'created'">
52+
<span v-if="record.created">{{ $toLocaleDate(record.created) }}</span>
53+
</template>
5154
<template v-if="column.key === 'actions'">
5255
<tooltip-button
5356
style="margin-right: 5px"
@@ -311,6 +314,11 @@ export default {
311314
title: this.$t('label.zonename'),
312315
dataIndex: 'zonename'
313316
},
317+
{
318+
key: 'created',
319+
title: this.$t('label.created'),
320+
dataIndex: 'created'
321+
},
314322
{
315323
title: this.$t('label.status'),
316324
dataIndex: 'status'

0 commit comments

Comments
 (0)