Skip to content

Commit faf27e2

Browse files
author
Hoang Nguyen
authored
listview: goto account info instead of list account (#4767)
1 parent 6836a94 commit faf27e2

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

ui/src/components/view/ListView.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
<span style="margin-right:5px" :key="idx">
197197
<span v-if="$store.getters.userInfo.roletype !== 'User'">
198198
<router-link v-if="'user' in item" :to="{ path: '/accountuser', query: { username: item.user, domainid: record.domainid }}">{{ item.account + '(' + item.user + ')' }}</router-link>
199-
<router-link v-else :to="{ path: '/account', query: { name: item.account, domainid: record.domainid } }">{{ item.account }}</router-link>
199+
<router-link v-else :to="{ path: '/account', query: { name: item.account, domainid: record.domainid, dataView: true } }">{{ item.account }}</router-link>
200200
</span>
201201
<span v-else>{{ item.user ? item.account + '(' + item.user + ')' : item.account }}</span>
202202
</span>
@@ -207,7 +207,7 @@
207207
v-if="'quota' in record && $router.resolve(`${$route.path}/${record.account}`) !== '404'"
208208
:to="{ path: `${$route.path}/${record.account}`, query: { account: record.account, domainid: record.domainid, quota: true } }">{{ text }}</router-link>
209209
<router-link :to="{ path: '/account/' + record.accountid }" v-else-if="record.accountid">{{ text }}</router-link>
210-
<router-link :to="{ path: '/account', query: { name: record.account, domainid: record.domainid } }" v-else-if="$store.getters.userInfo.roletype !== 'User'">{{ text }}</router-link>
210+
<router-link :to="{ path: '/account', query: { name: record.account, domainid: record.domainid, dataView: true } }" v-else-if="$store.getters.userInfo.roletype !== 'User'">{{ text }}</router-link>
211211
<span v-else>{{ text }}</span>
212212
</template>
213213
</span>

ui/src/config/router.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ function generateRouterMap (section) {
131131
map.meta.actions = section.actions
132132
map.meta.filters = section.filters
133133
map.meta.treeView = section.treeView ? section.treeView : false
134-
map.meta.tabs = section.treeView ? section.tabs : {}
134+
map.meta.tabs = section.tabs
135135

136136
map.children = [{
137137
path: '/' + section.name + '/:id',

ui/src/views/AutogenView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ export default {
528528
529529
this.projectView = Boolean(store.getters.project && store.getters.project.id)
530530
531-
if (this.$route && this.$route.params && this.$route.params.id) {
531+
if ((this.$route && this.$route.params && this.$route.params.id) || this.$route.query.dataView) {
532532
this.dataView = true
533533
if (!refreshed) {
534534
this.resource = {}

0 commit comments

Comments
 (0)