Skip to content

Commit 8db248e

Browse files
authored
UI: Move templates creation date to the Zones tab (#10709)
* UI: Move templates creation date to the Zones tab * Extend changes to ISOs
1 parent 53d3d19 commit 8db248e

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
@@ -629,7 +629,7 @@
629629
<span v-else>{{ resource.podname || resource.pod || resource.podid }}</span>
630630
</div>
631631
</div>
632-
<div class="resource-detail-item" v-if="resource.zoneid">
632+
<div class="resource-detail-item" v-if="resource.zoneid && !['template', 'iso'].includes($route.path.split('/')[1])">
633633
<div class="resource-detail-item__label">{{ $t('label.zone') }}</div>
634634
<div class="resource-detail-item__details">
635635
<span v-if="images.zone">
@@ -700,7 +700,7 @@
700700
<span v-else>{{ resource.managementserver || resource.managementserverid }}</span>
701701
</div>
702702
</div>
703-
<div class="resource-detail-item" v-if="resource.created">
703+
<div class="resource-detail-item" v-if="resource.created && !['template', 'iso'].includes($route.path.split('/')[1])">
704704
<div class="resource-detail-item__label">{{ $t('label.created') }}</div>
705705
<div class="resource-detail-item__details">
706706
<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"
@@ -308,6 +311,11 @@ export default {
308311
title: this.$t('label.zonename'),
309312
dataIndex: 'zonename'
310313
},
314+
{
315+
key: 'created',
316+
title: this.$t('label.created'),
317+
dataIndex: 'created'
318+
},
311319
{
312320
title: this.$t('label.status'),
313321
dataIndex: 'status'

0 commit comments

Comments
 (0)