Skip to content

Commit 0caf18b

Browse files
DaanHooglandDaanHoogland
authored
ui: indent issue in list view (#8184)
Fixes list view issues in UI after forward merge
1 parent 121531e commit 0caf18b

File tree

1 file changed

+68
-68
lines changed

1 file changed

+68
-68
lines changed

‎ui/src/components/view/ListView.vue‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -201,76 +201,76 @@
201201
@exec-action="$parent.execAction"/>
202202
<router-link :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
203203
</span>
204+
<span v-else>{{ text }}</span>
204205
</template>
205-
<span v-else>{{ text }}</span>
206-
</template>
207-
<template v-if="column.key === 'osname'">
208-
<span v-if="$route.name === 'guestos'">
209-
<router-link :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
210-
</span>
211-
<span v-else>{{ text }}</span>
212-
</template>
213-
<template v-if="column.key === 'state'">
214-
<status v-if="$route.path.startsWith('/host')" :text="getHostState(record)" displayText />
215-
<status v-else :text="text ? text : ''" displayText :styles="{ 'min-width': '80px' }" />
216-
</template>
217-
<template v-if="column.key === 'status'">
218-
<status :text="text ? text : ''" displayText />
219-
</template>
220-
<template v-if="column.key === 'allocationstate'">
221-
<status :text="text ? text : ''" displayText />
222-
</template>
223-
<template v-if="column.key === 'resourcestate'">
224-
<status :text="text ? text : ''" displayText />
225-
</template>
226-
<template v-if="column.key === 'powerstate'">
227-
<status :text="text ? text : ''" displayText />
228-
</template>
229-
<template v-if="column.key === 'agentstate'">
230-
<status :text="text ? text : ''" displayText />
231-
</template>
232-
<template v-if="column.key === 'quotastate'">
233-
<status :text="text ? text : ''" displayText />
234-
</template>
235-
<template v-if="column.key === 'vlan'">
236-
<a href="javascript:;">
237-
<router-link v-if="$route.path === '/guestvlans'" :to="{ path: '/guestvlans/' + record.id }">{{ text }}</router-link>
238-
</a>
239-
</template>
240-
<template v-if="column.key === 'guestnetworkname'">
241-
<router-link :to="{ path: '/guestnetwork/' + record.guestnetworkid }">{{ text }}</router-link>
242-
</template>
243-
<template v-if="column.key === 'associatednetworkname'">
244-
<router-link :to="{ path: '/guestnetwork/' + record.associatednetworkid }">{{ text }}</router-link>
245-
</template>
246-
<template v-if="column.key === 'vpcname'">
247-
<a v-if="record.vpcid">
248-
<router-link :to="{ path: '/vpc/' + record.vpcid }">{{ text }}</router-link>
249-
</a>
250-
<span v-else>{{ text }}</span>
251-
</template>
252-
<template v-if="column.key === 'hostname'">
253-
<router-link v-if="record.hostid" :to="{ path: '/host/' + record.hostid }">{{ text }}</router-link>
254-
<router-link v-else-if="record.hostname" :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
255-
<span v-else>{{ text }}</span>
256-
</template>
257-
<template v-if="column.key === 'storage'">
258-
<router-link v-if="record.storageid" :to="{ path: '/storagepool/' + record.storageid }">{{ text }}</router-link>
259-
<span v-else>{{ text }}</span>
260-
</template>
261-
<template v-for="(value, name) in thresholdMapping" :key="name">
262-
<template v-if="column.key === name">
263-
<span>
264-
<span v-if="record[value.disable]" class="alert-disable-threshold">
265-
{{ text }}
266-
</span>
267-
<span v-else-if="record[value.notification]" class="alert-notification-threshold">
268-
{{ text }}
269-
</span>
270-
<span style="padding: 10%;" v-else>
271-
{{ text }}
272-
</span>
206+
<template v-if="column.key === 'osname'">
207+
<span v-if="$route.name === 'guestos'">
208+
<router-link :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
273209
</span>
210+
<span v-else>{{ text }}</span>
211+
</template>
212+
<template v-if="column.key === 'state'">
213+
<status v-if="$route.path.startsWith('/host')" :text="getHostState(record)" displayText />
214+
<status v-else :text="text ? text : ''" displayText :styles="{ 'min-width': '80px' }" />
215+
</template>
216+
<template v-if="column.key === 'status'">
217+
<status :text="text ? text : ''" displayText />
218+
</template>
219+
<template v-if="column.key === 'allocationstate'">
220+
<status :text="text ? text : ''" displayText />
221+
</template>
222+
<template v-if="column.key === 'resourcestate'">
223+
<status :text="text ? text : ''" displayText />
224+
</template>
225+
<template v-if="column.key === 'powerstate'">
226+
<status :text="text ? text : ''" displayText />
227+
</template>
228+
<template v-if="column.key === 'agentstate'">
229+
<status :text="text ? text : ''" displayText />
230+
</template>
231+
<template v-if="column.key === 'quotastate'">
232+
<status :text="text ? text : ''" displayText />
233+
</template>
234+
<template v-if="column.key === 'vlan'">
235+
<a href="javascript:;">
236+
<router-link v-if="$route.path === '/guestvlans'" :to="{ path: '/guestvlans/' + record.id }">{{ text }}</router-link>
237+
</a>
238+
</template>
239+
<template v-if="column.key === 'guestnetworkname'">
240+
<router-link :to="{ path: '/guestnetwork/' + record.guestnetworkid }">{{ text }}</router-link>
241+
</template>
242+
<template v-if="column.key === 'associatednetworkname'">
243+
<router-link :to="{ path: '/guestnetwork/' + record.associatednetworkid }">{{ text }}</router-link>
244+
</template>
245+
<template v-if="column.key === 'vpcname'">
246+
<a v-if="record.vpcid">
247+
<router-link :to="{ path: '/vpc/' + record.vpcid }">{{ text }}</router-link>
248+
</a>
249+
<span v-else>{{ text }}</span>
250+
</template>
251+
<template v-if="column.key === 'hostname'">
252+
<router-link v-if="record.hostid" :to="{ path: '/host/' + record.hostid }">{{ text }}</router-link>
253+
<router-link v-else-if="record.hostname" :to="{ path: $route.path + '/' + record.id }">{{ text }}</router-link>
254+
<span v-else>{{ text }}</span>
255+
</template>
256+
<template v-if="column.key === 'storage'">
257+
<router-link v-if="record.storageid" :to="{ path: '/storagepool/' + record.storageid }">{{ text }}</router-link>
258+
<span v-else>{{ text }}</span>
259+
</template>
260+
<template v-for="(value, name) in thresholdMapping" :key="name">
261+
<template v-if="column.key === name">
262+
<span>
263+
<span v-if="record[value.disable]" class="alert-disable-threshold">
264+
{{ text }}
265+
</span>
266+
<span v-else-if="record[value.notification]" class="alert-notification-threshold">
267+
{{ text }}
268+
</span>
269+
<span style="padding: 10%;" v-else>
270+
{{ text }}
271+
</span>
272+
</span>
273+
</template>
274274
</template>
275275
<template v-if="column.key === 'level'">
276276
<router-link :to="{ path: '/event/' + record.id }">{{ text }}</router-link>

0 commit comments

Comments
 (0)