mirror of
https://github.com/apache/cloudstack.git
synced 2025-12-17 19:14:40 +01:00
UI: Enable listall (for Affinity Groups, SSH Keypairs, User Data) in deploy instance wizard for admin, and lists SSH Keypairs, User Data by domain/account (#11906)
This commit is contained in:
parent
255c4615dd
commit
e90e436ef8
@ -879,6 +879,7 @@
|
|||||||
import { ref, reactive, toRaw, nextTick, h } from 'vue'
|
import { ref, reactive, toRaw, nextTick, h } from 'vue'
|
||||||
import { Button } from 'ant-design-vue'
|
import { Button } from 'ant-design-vue'
|
||||||
import { api } from '@/api'
|
import { api } from '@/api'
|
||||||
|
import { isAdmin } from '@/role'
|
||||||
import _ from 'lodash'
|
import _ from 'lodash'
|
||||||
import { mixin, mixinDevice } from '@/utils/mixin.js'
|
import { mixin, mixinDevice } from '@/utils/mixin.js'
|
||||||
import store from '@/store'
|
import store from '@/store'
|
||||||
@ -1170,6 +1171,7 @@ export default {
|
|||||||
return _.map(this.affinityGroups, 'id')
|
return _.map(this.affinityGroups, 'id')
|
||||||
},
|
},
|
||||||
params () {
|
params () {
|
||||||
|
const listAll = isAdmin()
|
||||||
return {
|
return {
|
||||||
serviceOfferings: {
|
serviceOfferings: {
|
||||||
list: 'listServiceOfferings',
|
list: 'listServiceOfferings',
|
||||||
@ -1217,7 +1219,7 @@ export default {
|
|||||||
domainid: this.owner.domainid,
|
domainid: this.owner.domainid,
|
||||||
projectid: this.owner.projectid,
|
projectid: this.owner.projectid,
|
||||||
keyword: undefined,
|
keyword: undefined,
|
||||||
listall: false
|
listall: listAll
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
sshKeyPairs: {
|
sshKeyPairs: {
|
||||||
@ -1225,8 +1227,11 @@ export default {
|
|||||||
options: {
|
options: {
|
||||||
page: 1,
|
page: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
|
account: this.owner.account,
|
||||||
|
domainid: this.owner.domainid,
|
||||||
|
projectid: this.owner.projectid,
|
||||||
keyword: undefined,
|
keyword: undefined,
|
||||||
listall: false
|
listall: listAll
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
userDatas: {
|
userDatas: {
|
||||||
@ -1234,8 +1239,11 @@ export default {
|
|||||||
options: {
|
options: {
|
||||||
page: 1,
|
page: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
|
account: this.owner.account,
|
||||||
|
domainid: this.owner.domainid,
|
||||||
|
projectid: this.owner.projectid,
|
||||||
keyword: undefined,
|
keyword: undefined,
|
||||||
listall: false
|
listall: listAll
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
networks: {
|
networks: {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user