You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2016/01/11 16:19:59 UTC
[1/2] git commit: updated refs/heads/4.7 to 80703ca
Repository: cloudstack
Updated Branches:
refs/heads/4.7 4b974c599 -> 80703ca33
Admin cannot see VMs on port forwarding page
On commir a902443708ee10acb9f68fff74af346a6a9fb370 the 'listAll=true'
is removed. On some places the domainid and accountid are added but not
on these. I added them now.
It's either doing this, or readding listAll is true. I've seeing other
folks doing that so let's see what performs best.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f1861819
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f1861819
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f1861819
Branch: refs/heads/4.7
Commit: f1861819104c43b776fa1c4083112adece6a5cf5
Parents: 456d854
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Jan 8 22:00:01 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Fri Jan 8 22:00:01 2016 +0100
----------------------------------------------------------------------
ui/scripts/network.js | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1861819/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 2831aa0..cdfbcaa 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -3526,6 +3526,8 @@
if ('vpc' in args.context) {
var data = {
//listAll: true, //do not pass listAll to listNetworks under VPC
+ domainid: args.context.vpc[0].domainid,
+ account: args.context.vpc[0].account,
supportedservices: 'Lb'
};
if (args.context.ipAddresses[0].associatednetworkid == null) {
@@ -4158,6 +4160,8 @@
if ('vpc' in args.context) {
var data = {
//listAll: true, //do not pass listAll to listNetworks under VPC
+ domainid: args.context.vpc[0].domainid,
+ account: args.context.vpc[0].account,
supportedservices: 'PortForwarding'
};
if (args.context.ipAddresses[0].associatednetworkid == null) {
[2/2] git commit: updated refs/heads/4.7 to 80703ca
Posted by re...@apache.org.
Merge pull request #1325 from remibergsma/vpc_ui_fix_47
CLOUDSTACK-9221 Allow admin to see user VMs on port forwarding pageOn commit a902443708ee10acb9f68fff74af346a6a9fb370 the 'listAll=true' is removed. On some places the domainid and accountid are added but not on these. I added them now.
It's either doing this, or readding listAll is true. I've seeing other folks doing that so let's see what performs best.
* pr/1325:
Admin cannot see VMs on port forwarding page
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/80703ca3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/80703ca3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/80703ca3
Branch: refs/heads/4.7
Commit: 80703ca33c07ef57d80acf816d6db0af803dcb45
Parents: 4b974c5 f186181
Author: Remi Bergsma <gi...@remi.nl>
Authored: Mon Jan 11 16:19:46 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Mon Jan 11 16:19:46 2016 +0100
----------------------------------------------------------------------
ui/scripts/network.js | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------