This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack-primate.git
The following commit(s) were added to refs/heads/master by this push:
new 6295c88 Fixing mine / all for vm list view (#614)
6295c88 is described below
commit 6295c880d969227050e105b33a60e5456cac8b94
Author: davidjumani <[email protected]>
AuthorDate: Tue Aug 25 13:06:00 2020 +0530
Fixing mine / all for vm list view (#614)
---
src/views/AutogenView.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/AutogenView.vue b/src/views/AutogenView.vue
index a00637f..8b79ef3 100644
--- a/src/views/AutogenView.vue
+++ b/src/views/AutogenView.vue
@@ -45,11 +45,11 @@
<a-select
v-if="!dataView && $route.meta.filters &&
$route.meta.filters.length > 0"
:placeholder="$t('label.filterby')"
- :value="$route.query.filter || 'self'"
+ :value="$route.query.filter || (['Admin',
'DomainAdmin'].includes($store.getters.userInfo.roletype) && $route.name ===
'vm' ? 'all' : 'self')"
style="min-width: 100px; margin-left: 10px"
@change="changeFilter">
<a-icon slot="suffixIcon" type="filter" />
- <a-select-option v-if="['Admin',
'DomainAdmin'].includes($store.getters.userInfo.roletype) || $route.name ===
'vm'" key="all">
+ <a-select-option v-if="['Admin',
'DomainAdmin'].includes($store.getters.userInfo.roletype) && $route.name ===
'vm'" key="all">
{{ $t('label.all') }}
</a-select-option>
<a-select-option v-for="filter in $route.meta.filters"
:key="filter">
