etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hiding self filter for project view 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
davidjumani 2020-09-11 10:50:13 +05:30 committed by Rohit Yadav
parent 3e4119c5b6
commit 4eb8dc1824
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/config/section/compute.js
View File

@ -30,7 +30,13 @@ export default {
docHelp: 'adminguide/virtual_machines.html',
permission: ['listVirtualMachinesMetrics'],
resourceType: 'UserVm',
filters: ['self', 'running', 'stopped'],
filters: () => {
const filters = ['running', 'stopped']
if (!(store.getters.project && store.getters.project.id)) {
filters.unshift('self')
}
return filters
},
columns: () => {
const fields = ['name', 'state', 'ipaddress']
const metricsFields = ['cpunumber', 'cpuused', 'cputotal',

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

@ -43,16 +43,18 @@
{{ $t('label.filterby') }}
</template>
<a-select
v-if="!dataView && $route.meta.filters && $route.meta.filters.length > 0"
v-if="!dataView && filters && filters.length > 0"
:placeholder="$t('label.filterby')"
:value="$route.query.filter || (['Admin', 'DomainAdmin'].includes($store.getters.userInfo.roletype) && ['vm', 'iso', 'template'].includes($route.name) ? 'all' : 'self')"
:value="$route.query.filter || (projectView && $route.name === 'vm' ||
['Admin', 'DomainAdmin'].includes($store.getters.userInfo.roletype) && ['vm', 'iso', 'template'].includes($route.name)
? '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) && ['vm', 'iso', 'template'].includes($route.name)" key="all">
{{ $t('label.all') }}
</a-select-option>
<a-select-option v-for="filter in $route.meta.filters" :key="filter">
<a-select-option v-for="filter in filters" :key="filter">
{{ $t('label.' + filter) }}
</a-select-option>
</a-select>
@ -379,6 +381,7 @@ export default {
currentAction: {},
showAction: false,
dataView: false,
projectView: false,
selectedFilter: '',
filters: [],
searchFilters: [],
@ -495,6 +498,12 @@ export default {
delete params.irefresh
this.searchFilters = this.$route && this.$route.meta && this.$route.meta.searchFilters
this.filters = this.$route && this.$route.meta && this.$route.meta.filters
if (typeof this.filters === 'function') {
this.filters = this.filters()
}
this.projectView = Boolean(store.getters.project && store.getters.project.id)
if (this.$route && this.$route.params && this.$route.params.id) {
this.dataView = true