From ca2ad97394b32653a84095d7311fa74f3e435b80 Mon Sep 17 00:00:00 2001 From: Anurag Awasthi Date: Fri, 28 Jun 2019 11:44:59 +0530 Subject: [PATCH] Don't pass account name when in project mode --- ui/scripts/instances.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 0a89fdcb8f63..e108788aa674 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -750,9 +750,13 @@ if ("sshkeypairs" in args.context) { $.extend(data, { domainid: args.context.sshkeypairs[0].domainid, - account: args.context.sshkeypairs[0].account, keypair: args.context.sshkeypairs[0].name }); + if (!cloudStack.context || !cloudStack.context.projects) { + // In case we are in project mode sshkeypairs provides project account name which + // should not be passed as part of API params. So only extend if NOT in project mode. + $.extend(data, { account: args.context.sshkeypairs[0].account}); + } } $.ajax({