|
55 | 55 | :placeholder="$t('label.filterby')" |
56 | 56 | :value="$route.query.filter || (projectView && $route.name === 'vm' || |
57 | 57 | ['Admin', 'DomainAdmin'].includes($store.getters.userInfo.roletype) && ['vm', 'iso', 'template'].includes($route.name) |
58 | | - ? 'all' : ['publicip'].includes($route.name) |
59 | | - ? 'allocated' : ['guestnetwork', 'guestvlans'].includes($route.name) ? 'all' : 'self')" |
| 58 | + ? 'all' : ['publicip'].includes($route.name) |
| 59 | + ? 'allocated' : ['guestnetwork', 'guestvlans'].includes($route.name) |
| 60 | + ? 'all' : ['volume'].includes($route.name) |
| 61 | + ? 'user' : 'self')" |
60 | 62 | style="min-width: 120px; margin-left: 10px" |
61 | 63 | @change="changeFilter" |
62 | 64 | showSearch |
@@ -847,10 +849,6 @@ export default { |
847 | 849 | delete params.showunique |
848 | 850 | } |
849 | 851 |
|
850 | | - if (['Admin'].includes(this.$store.getters.userInfo.roletype) && ['listVolumesMetrics', 'listVolumes'].includes(this.apiName)) { |
851 | | - params.listsystemvms = true |
852 | | - } |
853 | | -
|
854 | 852 | this.loading = true |
855 | 853 | if (this.$route.params && this.$route.params.id) { |
856 | 854 | params.id = this.$route.params.id |
@@ -1542,6 +1540,12 @@ export default { |
1542 | 1540 | query.templatefilter = filter |
1543 | 1541 | } else if (this.$route.name === 'iso') { |
1544 | 1542 | query.isofilter = filter |
| 1543 | + } else if (this.$route.name === 'volume') { |
| 1544 | + if (filter === 'all') { |
| 1545 | + query.listsystemvms = true |
| 1546 | + } else { |
| 1547 | + delete query.listsystemvms |
| 1548 | + } |
1545 | 1549 | } else if (this.$route.name === 'guestnetwork') { |
1546 | 1550 | if (filter === 'all') { |
1547 | 1551 | delete query.networkfilter |
|
0 commit comments