You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2021/03/17 12:16:44 UTC
[cloudstack] branch master updated (c8f7c0d -> 775de36)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from c8f7c0d Merge remote-tracking branch 'origin/4.15'
add d81141e Project Role Permission: Change default permission type to 'Deny' (#4832)
add abcd07c ui: change createAccount to use post (#4812)
add 136252d server: Maintain order or project owners added to account (#4822)
add 9caa535 ui: Show label for view console action (#4823)
add a291dea ui: Fixes for action messages and forms (#4824)
add 4c88021 novnc: Fix vm console is not working on firefox if language is not English (#4833)
add e266419 server: Fix NPE while cloudstack agent failed to connect to mgt server (#4779)
add c2b378c novnc: Hide fullscreen button when not connected (#4783)
add f07e4d3 ui: Show vm name along with password (#4821)
new 775de36 Merge remote-tracking branch 'origin/4.15'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cloud/projects/dao/ProjectAccountDaoImpl.java | 5 +++--
.../java/com/cloud/capacity/CapacityManagerImpl.java | 8 +++-----
.../java/com/cloud/servlet/ConsoleProxyServlet.java | 6 ++++--
systemvm/agent/noVNC/app/styles/base.css | 4 ++++
systemvm/agent/noVNC/vnc.html | 5 -----
ui/public/locales/en.json | 7 ++++++-
ui/src/components/view/ActionButton.vue | 7 ++++++-
ui/src/config/section/compute.js | 3 ++-
ui/src/config/section/domain.js | 2 +-
ui/src/config/section/infra/routers.js | 1 +
ui/src/config/section/infra/secondaryStorages.js | 20 +++++++++++---------
ui/src/config/section/infra/systemVms.js | 1 +
ui/src/config/section/network.js | 3 ++-
ui/src/views/AutogenView.vue | 7 +++++++
ui/src/views/compute/AssignInstance.vue | 12 ++++++++++--
ui/src/views/compute/StartVirtualMachine.vue | 2 +-
ui/src/views/iam/AddAccount.vue | 2 +-
ui/src/views/iam/DomainActionForm.vue | 3 +++
ui/src/views/project/AddAccountOrUserToProject.vue | 4 +++-
.../views/project/iam/ProjectRolePermissionTab.vue | 4 ++--
ui/src/views/storage/FormSchedule.vue | 6 +++---
ui/src/views/storage/MigrateVolume.vue | 9 +++++----
ui/src/views/storage/ResizeVolume.vue | 7 ++++---
ui/src/views/storage/TakeSnapshot.vue | 6 +++---
24 files changed, 86 insertions(+), 48 deletions(-)
[cloudstack] 01/01: Merge remote-tracking branch 'origin/4.15'
Posted by ro...@apache.org.
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.git
commit 775de36688b18dad651af69179cd7776d6d2b791
Merge: c8f7c0d f07e4d3
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Mar 17 17:46:16 2021 +0530
Merge remote-tracking branch 'origin/4.15'
.../cloud/projects/dao/ProjectAccountDaoImpl.java | 5 +++--
.../java/com/cloud/capacity/CapacityManagerImpl.java | 8 +++-----
.../java/com/cloud/servlet/ConsoleProxyServlet.java | 6 ++++--
systemvm/agent/noVNC/app/styles/base.css | 4 ++++
systemvm/agent/noVNC/vnc.html | 5 -----
ui/public/locales/en.json | 7 ++++++-
ui/src/components/view/ActionButton.vue | 7 ++++++-
ui/src/config/section/compute.js | 3 ++-
ui/src/config/section/domain.js | 2 +-
ui/src/config/section/infra/routers.js | 1 +
ui/src/config/section/infra/secondaryStorages.js | 20 +++++++++++---------
ui/src/config/section/infra/systemVms.js | 1 +
ui/src/config/section/network.js | 3 ++-
ui/src/views/AutogenView.vue | 7 +++++++
ui/src/views/compute/AssignInstance.vue | 12 ++++++++++--
ui/src/views/compute/StartVirtualMachine.vue | 2 +-
ui/src/views/iam/AddAccount.vue | 2 +-
ui/src/views/iam/DomainActionForm.vue | 3 +++
ui/src/views/project/AddAccountOrUserToProject.vue | 4 +++-
.../views/project/iam/ProjectRolePermissionTab.vue | 4 ++--
ui/src/views/storage/FormSchedule.vue | 6 +++---
ui/src/views/storage/MigrateVolume.vue | 9 +++++----
ui/src/views/storage/ResizeVolume.vue | 7 ++++---
ui/src/views/storage/TakeSnapshot.vue | 6 +++---
24 files changed, 86 insertions(+), 48 deletions(-)
diff --cc ui/src/config/section/infra/routers.js
index a338237,09f4fff..fd10acc
--- a/ui/src/config/section/infra/routers.js
+++ b/ui/src/config/section/infra/routers.js
@@@ -104,19 -103,19 +104,20 @@@ export default
api: 'migrateSystemVm',
icon: 'drag',
label: 'label.action.migrate.router',
+ message: 'message.migrate.router.confirm',
dataView: true,
- show: (record, store) => { return ['Running'].includes(record.state) && ['Admin'].includes(store.userInfo.roletype) },
- args: ['virtualmachineid', 'hostid'],
- mapping: {
- virtualmachineid: {
- value: (record) => { return record.id }
- },
- hostid: {
- api: 'findHostsForMigration',
- params: (record) => { return { virtualmachineid: record.id } }
- }
- }
+ show: (record, store) => { return record.state === 'Running' && ['Admin'].includes(store.userInfo.roletype) },
+ component: () => import('@/views/compute/MigrateWizard'),
+ popup: true
+ },
+ {
+ api: 'migrateSystemVm',
+ icon: 'drag',
+ label: 'label.action.migrate.systemvm.to.ps',
+ dataView: true,
+ show: (record, store) => { return ['Stopped'].includes(record.state) && ['VMware'].includes(record.hypervisor) },
+ component: () => import('@/views/compute/MigrateVMStorage'),
+ popup: true
},
{
api: 'runDiagnostics',
diff --cc ui/src/config/section/infra/systemVms.js
index 5c02734,8d519ca..181b8e8
--- a/ui/src/config/section/infra/systemVms.js
+++ b/ui/src/config/section/infra/systemVms.js
@@@ -69,19 -68,19 +69,20 @@@ export default
api: 'migrateSystemVm',
icon: 'drag',
label: 'label.action.migrate.systemvm',
+ message: 'message.migrate.systemvm.confirm',
dataView: true,
- show: (record) => { return record.state === 'Running' },
- args: ['virtualmachineid', 'hostid'],
- mapping: {
- virtualmachineid: {
- value: (record) => { return record.id }
- },
- hostid: {
- api: 'findHostsForMigration',
- params: (record) => { return { virtualmachineid: record.id } }
- }
- }
+ show: (record, store) => { return record.state === 'Running' && ['Admin'].includes(store.userInfo.roletype) },
+ component: () => import('@/views/compute/MigrateWizard'),
+ popup: true
+ },
+ {
+ api: 'migrateSystemVm',
+ icon: 'drag',
+ label: 'label.action.migrate.systemvm.to.ps',
+ dataView: true,
+ show: (record, store) => { return ['Stopped'].includes(record.state) && ['VMware'].includes(record.hypervisor) },
+ component: () => import('@/views/compute/MigrateVMStorage'),
+ popup: true
},
{
api: 'runDiagnostics',