apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

ui: Incorrect column key specified in secondary store column filter (#6275)

Browse Source
This commit is contained in:
Pearl Dsilva 2022-04-18 15:07:10 +05:30 committed by GitHub
parent 976464ccb9
commit 14dd467a43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/components/view/ListView.vue
View File

@ -283,7 +283,7 @@
<router-link v-if="record.roleid && $router.resolve('/role/' + record.roleid).matched[0].redirect !== '/exception/404'" :to="{ path: '/role/' + record.roleid }">{{ text }}</router-link> <router-link v-if="record.roleid && $router.resolve('/role/' + record.roleid).matched[0].redirect !== '/exception/404'" :to="{ path: '/role/' + record.roleid }">{{ text }}</router-link>
<span v-else>{{ text }}</span> <span v-else>{{ text }}</span>
</template> </template>
<template #readonly="{ record }"> <template #access="{ record }">
<status :text="record.readonly ? 'ReadOnly' : 'ReadWrite'" displayText /> <status :text="record.readonly ? 'ReadOnly' : 'ReadWrite'" displayText />
</template> </template>
<template #requiresupgrade="{ record }"> <template #requiresupgrade="{ record }">
@ -764,7 +764,7 @@ export default {
}, },
getColumnKey (name) { getColumnKey (name) {
if (typeof name === 'object') { if (typeof name === 'object') {
name = Object.keys(name)[0] name = Object.keys(name).includes('customTitle') ? name.customTitle : name.field
} }
return name return name
}, },

4
ui/src/views/AutogenView.vue
View File

@ -805,7 +805,7 @@ export default {
let title = columnKey let title = columnKey
if (typeof columnKey === 'object') { if (typeof columnKey === 'object') {
if ('customTitle' in columnKey && 'field' in columnKey) { if ('customTitle' in columnKey && 'field' in columnKey) {
key = columnKey.field key = columnKey.customTitle
title = columnKey.customTitle title = columnKey.customTitle
customRender[key] = columnKey[key] customRender[key] = columnKey[key]
} else { } else {
@ -1455,7 +1455,7 @@ export default {
}, },
getColumnKey (name) { getColumnKey (name) {
if (typeof name === 'object') { if (typeof name === 'object') {
name = Object.keys(name)[0] name = Object.keys(name).includes('customTitle') ? name.customTitle : name.field
} }
return name return name
}, },