diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js index a4241a2d248..51a7ffcab39 100644 --- a/ui/src/config/section/compute.js +++ b/ui/src/config/section/compute.js @@ -241,6 +241,8 @@ export default { icon: 'user-add', label: 'Assign Instance to Another Account', dataView: true, + component: () => import('@/views/compute/AssignInstance'), + popup: true, show: (record) => { return ['Stopped'].includes(record.state) }, args: ['virtualmachineid', 'account', 'domainid'], mapping: { diff --git a/ui/src/locales/en.json b/ui/src/locales/en.json index ec0282e4e93..d330ce29b2b 100644 --- a/ui/src/locales/en.json +++ b/ui/src/locales/en.json @@ -631,6 +631,7 @@ "memoryusedgb": "Used", "memused": "Memory Usage", "message.edit.account": "Edit (\"-1\" indicates no limit to the amount of resources create)", +"message.assign.instance.another": "Please specify the account type, domain, account name and network (optional) of the new account.
If the default nic of the vm is on a shared network, CloudStack will check if the network can be used by the new account if you do not specify one network.
If the default nic of the vm is on a isolated network, and the new account has more one isolated networks, you should specify one.", "minCPUNumber": "Min CPU Cores", "minInstance": "Min Instances", "minIops": "Min IOPS", @@ -754,6 +755,7 @@ "redundantvpcrouter": "Redundant VPC", "reenterpassword": "Re-enter Password", "relationaloperator": "Operator", +"required": "Required", "requireshvm": "HVM", "requiresupgrade": "Requires Upgrade", "reservedSystemEndIp": "End Reserved system IP", @@ -836,6 +838,7 @@ "storagepolicy": "Storage policy", "storagetype": "Storage Type", "subdomainaccess": "Subdomain Access", +"submit": "Submit", "supportedServices": "Supported Services", "supportspublicaccess": "Supports Public Access", "supportsregionLevelvpc": "Supports Region Level VPC", diff --git a/ui/src/utils/request.js b/ui/src/utils/request.js index c38e7f40682..235793ad097 100644 --- a/ui/src/utils/request.js +++ b/ui/src/utils/request.js @@ -57,10 +57,10 @@ const err = (error) => { // request interceptor service.interceptors.request.use(config => { - const project = Vue.ls.get(CURRENT_PROJECT) if (config && config.params) { config.params.response = 'json' - if (project && project.id) { + const project = Vue.ls.get(CURRENT_PROJECT) + if (!config.params.projectid && project && project.id) { config.params.projectid = project.id } } diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue index 00502394c5d..1e570730dd0 100644 --- a/ui/src/views/AutogenView.vue +++ b/ui/src/views/AutogenView.vue @@ -19,10 +19,10 @@
- + - +