From 0cdca3137f80f9f3b4f4a4bbf7b6dc574cedb5c0 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 4 Nov 2015 13:27:10 +0100 Subject: [PATCH 1/5] [UI] fix typo for user data field --- ui/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/index.jsp b/ui/index.jsp index 9ea62c08d5b..302e464de65 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -586,7 +586,7 @@
-
+
()
From eccdf4f1fb20e88f5cf31b442f11f47fe342a7db Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 4 Nov 2015 13:29:06 +0100 Subject: [PATCH 2/5] [UI] Private Cloud VPC always shows 0 in Site-to-Site VPN, even when one is configured --- ui/scripts/vpc.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index 5e5b2aaa381..96bf02f462a 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -2682,6 +2682,7 @@ $.ajax({ url: createURL("listVpnGateways"), data: { + listAll: true, id: args.context.vpnGateway[0].id }, async: true, @@ -2804,6 +2805,7 @@ $.ajax({ url: createURL('listVpnGateways'), data: { + listAll: true, vpcid: args.context.vpc[0].id }, async: false, @@ -4187,6 +4189,7 @@ url: createURL('listVpnGateways'), async: false, data: { + listAll: true, 'vpcid': args.context.vpc[0].id }, success: function(json) { From d76a47b9fd31b27ab51a3cef7b71f73f3d76cee3 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 5 Nov 2015 08:04:23 +0100 Subject: [PATCH 3/5] [UI] change the Icon for changing ACL's for a tier in a VPC --- ui/css/cloudstack3.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index a04ff7cad1b..2ea85374024 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -12506,17 +12506,13 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it .downloadVolume .icon, .downloadTemplate .icon, -.downloadISO .icon, -.replaceacllist .icon, -.replaceACL .icon { +.downloadISO .icon { background-position: -35px -125px; } .downloadVolume:hover .icon, .downloadTemplate:hover .icon, -.downloadISO:hover .icon, -.replaceacllist:hover .icon, -.replaceACL:hover .icon { +.downloadISO:hover .icon { background-position: -35px -707px; } @@ -12831,10 +12827,14 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it background-position: -228px -646px; } +.replaceacllist .icon, +.replaceACL .icon, .changeAffinity .icon { background-position: -264px -2px; } +.replaceacllist:hover .icon, +.replaceACL:hover .icon, .changeAffinity:hover .icon { background-position: -263px -583px; } From cb9bf445388176398326bbd3e57c191286245257 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 5 Nov 2015 08:04:34 +0100 Subject: [PATCH 4/5] =?UTF-8?q?[UI]=20Network=20names=20are=20not=20being?= =?UTF-8?q?=20displayed=20in=20Infra=20=C2=BB=20VRs=20=C2=BB=20router=20?= =?UTF-8?q?=C2=BB=20NICS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java index 6f7ef43048c..52c36e8b5c3 100644 --- a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java @@ -219,6 +219,7 @@ public class DomainRouterJoinDaoImpl extends GenericDaoBase Date: Wed, 23 Sep 2015 14:59:28 +0200 Subject: [PATCH 5/5] [UI] change alert to ui dialog in response of instance wizard --- ui/scripts/instanceWizard.js | 4 +++- ui/scripts/vpc.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js index 1401acef8e2..98ac62bd073 100644 --- a/ui/scripts/instanceWizard.js +++ b/ui/scripts/instanceWizard.js @@ -1068,7 +1068,9 @@ getUpdatedItem: function(json) { var item = json.queryasyncjobresultresponse.jobresult.virtualmachine; if (item.password != null) - alert("Password of new VM " + item.displayname + " is " + item.password); + cloudStack.dialog.notice({ + message: "Password of new VM " + item.displayname + " is " + item.password + }); return item; }, getActionFilter: function() { diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index 96bf02f462a..41d10edc73a 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -1507,7 +1507,9 @@ }, complete: function(args) { if (args.password != null) { - alert('Password of the VM is ' + args.password); + cloudStack.dialog.notice({ + message: 'Password of the VM is ' + args.password + }); } return 'label.action.start.instance'; }