[cloudstack] branch main updated: ui: Incorrect column key specified in secondary store column filter (#6275)

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit 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 14dd467a43 ui: Incorrect column key specified in secondary store column filter (#6275)
14dd467a43 is described below

commit 14dd467a435b76729ec505495acfabe77d78c99a
Author: Pearl Dsilva <pe...@gmail.com>
AuthorDate: Mon Apr 18 15:07:10 2022 +0530

    ui: Incorrect column key specified in secondary store column filter (#6275)
---
 ui/src/components/view/ListView.vue | 4 ++--
 ui/src/views/AutogenView.vue        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index abdd5758bd..e05e5ab1dc 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -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>
       <span v-else>{{ text }}</span>
     </template>
-    <template #readonly="{ record }">
+    <template #access="{ record }">
       <status :text="record.readonly ? 'ReadOnly' : 'ReadWrite'" displayText />
     </template>
     <template #requiresupgrade="{ record }">
@@ -764,7 +764,7 @@ export default {
     },
     getColumnKey (name) {
       if (typeof name === 'object') {
-        name = Object.keys(name)[0]
+        name = Object.keys(name).includes('customTitle') ? name.customTitle : name.field
       }
       return name
     },
diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index 2a3c3eae9c..69eea6b6e4 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -805,7 +805,7 @@ export default {
         let title = columnKey
         if (typeof columnKey === 'object') {
           if ('customTitle' in columnKey && 'field' in columnKey) {
-            key = columnKey.field
+            key = columnKey.customTitle
             title = columnKey.customTitle
             customRender[key] = columnKey[key]
           } else {
@@ -1455,7 +1455,7 @@ export default {
     },
     getColumnKey (name) {
       if (typeof name === 'object') {
-        name = Object.keys(name)[0]
+        name = Object.keys(name).includes('customTitle') ? name.customTitle : name.field
       }
       return name
     },