Skip to content

Commit e2e9975

Browse files
review changes
1 parent bd98e92 commit e2e9975

2 files changed

Lines changed: 18 additions & 4 deletions

File tree

ui/src/components/view/ListView.vue

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -739,6 +739,20 @@
739739
>{{ text }}</router-link>
740740
<span v-else>{{ text }}</span>
741741
</template>
742+
<template v-if="column.key === 'parentname' && ['snapshot'].includes($route.path.split('/')[1])">
743+
<router-link
744+
v-if="record.parent && $router.resolve('/snapshot/' + record.parent).matched[0].redirect !== '/exception/404'"
745+
:to="{ path: '/snapshot/' + record.parent }"
746+
>{{ text }}</router-link>
747+
<span v-else>{{ text }}</span>
748+
</template>
749+
<template v-if="column.key === 'parentName' && ['vmsnapshot'].includes($route.path.split('/')[1])">
750+
<router-link
751+
v-if="record.parent && $router.resolve('/vmsnapshot/' + record.parent).matched[0].redirect !== '/exception/404'"
752+
:to="{ path: '/vmsnapshot/' + record.parent }"
753+
>{{ text }}</router-link>
754+
<span v-else>{{ text }}</span>
755+
</template>
742756
<template v-if="column.key === 'templateversion'">
743757
<span> {{ record.version }} </span>
744758
</template>

ui/src/config/section/storage.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export default {
9292
}
9393
],
9494
searchFilters: () => {
95-
var filters = ['name', 'zoneid', 'domainid', 'account', 'state', 'tags', 'serviceofferingid', 'diskofferingid', 'isencrypted']
95+
const filters = ['name', 'zoneid', 'domainid', 'account', 'state', 'tags', 'serviceofferingid', 'diskofferingid', 'isencrypted']
9696
if (['Admin', 'DomainAdmin'].includes(store.getters.userInfo.roletype)) {
9797
filters.push('storageid')
9898
}
@@ -311,7 +311,7 @@ export default {
311311
permission: ['listSnapshots'],
312312
resourceType: 'Snapshot',
313313
columns: () => {
314-
var fields = ['name', 'state', 'volumename', 'intervaltype', 'physicalsize', 'created']
314+
const fields = ['name', 'state', 'volumename', 'intervaltype', 'physicalsize', 'created']
315315
if (store.getters.features.snapshotshowchainsize) {
316316
fields.splice(fields.indexOf('created'), 0, 'chainsize', 'parentname')
317317
}
@@ -328,7 +328,7 @@ export default {
328328
return fields
329329
},
330330
details: () => {
331-
var fields = ['name', 'id', 'volumename', 'volumetype', 'snapshottype', 'intervaltype', 'physicalsize', 'virtualsize', 'account', 'domain', 'created']
331+
const fields = ['name', 'id', 'volumename', 'volumetype', 'snapshottype', 'intervaltype', 'physicalsize', 'virtualsize', 'account', 'domain', 'created']
332332
if (store.getters.features.snapshotshowchainsize) {
333333
fields.splice(fields.indexOf('account'), 0, 'chainsize', 'parentname')
334334
}
@@ -355,7 +355,7 @@ export default {
355355
}
356356
],
357357
searchFilters: () => {
358-
var filters = ['name', 'domainid', 'account', 'tags', 'zoneid']
358+
const filters = ['name', 'domainid', 'account', 'tags', 'zoneid']
359359
if (['Admin', 'DomainAdmin'].includes(store.getters.userInfo.roletype)) {
360360
filters.push('storageid')
361361
filters.push('imagestoreid')

0 commit comments

Comments
 (0)