This is an automated email from the ASF dual-hosted git repository.
shwstppr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 0caf18bc1a0 ui: indent issue in list view (#8184)
0caf18bc1a0 is described below
commit 0caf18bc1a02bf2d3240f66a492a3cf588f3ec37
Author: dahn <[email protected]>
AuthorDate: Sat Nov 4 08:03:29 2023 +0100
ui: indent issue in list view (#8184)
Fixes list view issues in UI after forward merge
---
ui/src/components/view/ListView.vue | 136 ++++++++++++++++++------------------
1 file changed, 68 insertions(+), 68 deletions(-)
diff --git a/ui/src/components/view/ListView.vue
b/ui/src/components/view/ListView.vue
index 6d0f4121425..cf52f058075 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -201,76 +201,76 @@
@exec-action="$parent.execAction"/>
<router-link :to="{ path: $route.path + '/' + record.id }">{{ text
}}</router-link>
</span>
+ <span v-else>{{ text }}</span>
</template>
- <span v-else>{{ text }}</span>
- </template>
- <template v-if="column.key === 'osname'">
- <span v-if="$route.name === 'guestos'">
- <router-link :to="{ path: $route.path + '/' + record.id }">{{ text
}}</router-link>
- </span>
- <span v-else>{{ text }}</span>
- </template>
- <template v-if="column.key === 'state'">
- <status v-if="$route.path.startsWith('/host')"
:text="getHostState(record)" displayText />
- <status v-else :text="text ? text : ''" displayText :styles="{
'min-width': '80px' }" />
- </template>
- <template v-if="column.key === 'status'">
- <status :text="text ? text : ''" displayText />
- </template>
- <template v-if="column.key === 'allocationstate'">
- <status :text="text ? text : ''" displayText />
- </template>
- <template v-if="column.key === 'resourcestate'">
- <status :text="text ? text : ''" displayText />
- </template>
- <template v-if="column.key === 'powerstate'">
- <status :text="text ? text : ''" displayText />
- </template>
- <template v-if="column.key === 'agentstate'">
- <status :text="text ? text : ''" displayText />
- </template>
- <template v-if="column.key === 'quotastate'">
- <status :text="text ? text : ''" displayText />
- </template>
- <template v-if="column.key === 'vlan'">
- <a href="javascript:;">
- <router-link v-if="$route.path === '/guestvlans'" :to="{ path:
'/guestvlans/' + record.id }">{{ text }}</router-link>
- </a>
- </template>
- <template v-if="column.key === 'guestnetworkname'">
- <router-link :to="{ path: '/guestnetwork/' + record.guestnetworkid }">{{
text }}</router-link>
- </template>
- <template v-if="column.key === 'associatednetworkname'">
- <router-link :to="{ path: '/guestnetwork/' + record.associatednetworkid
}">{{ text }}</router-link>
- </template>
- <template v-if="column.key === 'vpcname'">
- <a v-if="record.vpcid">
- <router-link :to="{ path: '/vpc/' + record.vpcid }">{{ text
}}</router-link>
- </a>
- <span v-else>{{ text }}</span>
- </template>
- <template v-if="column.key === 'hostname'">
- <router-link v-if="record.hostid" :to="{ path: '/host/' + record.hostid
}">{{ text }}</router-link>
- <router-link v-else-if="record.hostname" :to="{ path: $route.path + '/'
+ record.id }">{{ text }}</router-link>
- <span v-else>{{ text }}</span>
- </template>
- <template v-if="column.key === 'storage'">
- <router-link v-if="record.storageid" :to="{ path: '/storagepool/' +
record.storageid }">{{ text }}</router-link>
- <span v-else>{{ text }}</span>
- </template>
- <template v-for="(value, name) in thresholdMapping" :key="name">
- <template v-if="column.key === name">
- <span>
- <span v-if="record[value.disable]" class="alert-disable-threshold">
- {{ text }}
- </span>
- <span v-else-if="record[value.notification]"
class="alert-notification-threshold">
- {{ text }}
- </span>
- <span style="padding: 10%;" v-else>
- {{ text }}
- </span>
+ <template v-if="column.key === 'osname'">
+ <span v-if="$route.name === 'guestos'">
+ <router-link :to="{ path: $route.path + '/' + record.id }">{{ text
}}</router-link>
</span>
+ <span v-else>{{ text }}</span>
+ </template>
+ <template v-if="column.key === 'state'">
+ <status v-if="$route.path.startsWith('/host')"
:text="getHostState(record)" displayText />
+ <status v-else :text="text ? text : ''" displayText :styles="{
'min-width': '80px' }" />
+ </template>
+ <template v-if="column.key === 'status'">
+ <status :text="text ? text : ''" displayText />
+ </template>
+ <template v-if="column.key === 'allocationstate'">
+ <status :text="text ? text : ''" displayText />
+ </template>
+ <template v-if="column.key === 'resourcestate'">
+ <status :text="text ? text : ''" displayText />
+ </template>
+ <template v-if="column.key === 'powerstate'">
+ <status :text="text ? text : ''" displayText />
+ </template>
+ <template v-if="column.key === 'agentstate'">
+ <status :text="text ? text : ''" displayText />
+ </template>
+ <template v-if="column.key === 'quotastate'">
+ <status :text="text ? text : ''" displayText />
+ </template>
+ <template v-if="column.key === 'vlan'">
+ <a href="javascript:;">
+ <router-link v-if="$route.path === '/guestvlans'" :to="{ path:
'/guestvlans/' + record.id }">{{ text }}</router-link>
+ </a>
+ </template>
+ <template v-if="column.key === 'guestnetworkname'">
+ <router-link :to="{ path: '/guestnetwork/' + record.guestnetworkid
}">{{ text }}</router-link>
+ </template>
+ <template v-if="column.key === 'associatednetworkname'">
+ <router-link :to="{ path: '/guestnetwork/' +
record.associatednetworkid }">{{ text }}</router-link>
+ </template>
+ <template v-if="column.key === 'vpcname'">
+ <a v-if="record.vpcid">
+ <router-link :to="{ path: '/vpc/' + record.vpcid }">{{ text
}}</router-link>
+ </a>
+ <span v-else>{{ text }}</span>
+ </template>
+ <template v-if="column.key === 'hostname'">
+ <router-link v-if="record.hostid" :to="{ path: '/host/' +
record.hostid }">{{ text }}</router-link>
+ <router-link v-else-if="record.hostname" :to="{ path: $route.path +
'/' + record.id }">{{ text }}</router-link>
+ <span v-else>{{ text }}</span>
+ </template>
+ <template v-if="column.key === 'storage'">
+ <router-link v-if="record.storageid" :to="{ path: '/storagepool/' +
record.storageid }">{{ text }}</router-link>
+ <span v-else>{{ text }}</span>
+ </template>
+ <template v-for="(value, name) in thresholdMapping" :key="name">
+ <template v-if="column.key === name">
+ <span>
+ <span v-if="record[value.disable]" class="alert-disable-threshold">
+ {{ text }}
+ </span>
+ <span v-else-if="record[value.notification]"
class="alert-notification-threshold">
+ {{ text }}
+ </span>
+ <span style="padding: 10%;" v-else>
+ {{ text }}
+ </span>
+ </span>
+ </template>
</template>
<template v-if="column.key === 'level'">
<router-link :to="{ path: '/event/' + record.id }">{{ text
}}</router-link>
