From e9cc5551d310c288a4b5ff748eee00951020f9a2 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 3 Dec 2015 09:07:48 +0100 Subject: [PATCH] [UI] fix bug: Cannot delete SSH keypairs in projects Before change: error message: ProjectId and account/domainId can't be specified together After change: SSH keypairs can be removed --- ui/scripts/accounts.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js index f0c0bff80ad1..be620a46483d 100644 --- a/ui/scripts/accounts.js +++ b/ui/scripts/accounts.js @@ -1876,10 +1876,14 @@ }, action: function(args) { var data = { - domainid: args.context.sshkeypairs[0].domainid, - account: args.context.sshkeypairs[0].account, name: args.context.sshkeypairs[0].name }; + if (!args.context.projects) { + $.extend(data, { + domainid: args.context.sshkeypairs[0].domainid, + account: args.context.sshkeypairs[0].account, + }); + } $.ajax({ url: createURL('deleteSSHKeyPair'), data: data,