This is an automated email from the ASF dual-hosted git repository.
vishesh 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 ca66b76cb92 Fix instance & backup resource table columns (#9147)
ca66b76cb92 is described below
commit ca66b76cb92be368bbea40a3bdb2f4e54c0a32d2
Author: Henrique Sato <henriquesato2...@gmail.com>
AuthorDate: Fri Jun 7 04:55:54 2024 -0300
Fix instance & backup resource table columns (#9147)
Co-authored-by: Henrique Sato <henrique.s...@scclouds.com.br>
---
ui/src/components/view/ListResourceTable.vue | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/ui/src/components/view/ListResourceTable.vue
b/ui/src/components/view/ListResourceTable.vue
index 16c1b388c5d..a7e805b5443 100644
--- a/ui/src/components/view/ListResourceTable.vue
+++ b/ui/src/components/view/ListResourceTable.vue
@@ -41,21 +41,20 @@
<template v-if="column.key === col">
<router-link :set="routerlink = routerlinks(record)" :to="{ path:
routerlink[col] }" >{{ text }}</router-link>
</template>
- </div>
- <template v-if="column.key === 'state'">
- <status :text="text ? text : ''" />{{ text }}
- </template>
+ <template v-else-if="['state', 'status'].includes(column.key)">
+ <status :text="text ? text : ''" />{{ text }}
+ </template>
- <template v-if="column.key === 'status'">
- <status :text="text ? text : ''" />{{ text }}
- </template>
- </template>
+ <template v-else-if="column.key === 'created'">
+ {{ $toLocaleDate(text) }}
+ </template>
- <template v-slot:created="{ item }">
- {{ $toLocaleDate(item) }}
+ <template v-else>
+ {{ text }}
+ </template>
+ </div>
</template>
-
</a-table>
<div v-if="!defaultPagination" style="display: block; text-align: right;
margin-top: 10px;">
