cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [1/2] git commit: updated refs/heads/4.6 to 9ce1334
Date Mon, 07 Dec 2015 05:39:13 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.6 0d6194110 -> 9ce133401


[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


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e9cc5551
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e9cc5551
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e9cc5551

Branch: refs/heads/4.6
Commit: e9cc5551d310c288a4b5ff748eee00951020f9a2
Parents: 5b7d935
Author: Wei Zhou <w.zhou@tech.leaseweb.com>
Authored: Thu Dec 3 09:07:48 2015 +0100
Committer: Wei Zhou <w.zhou@tech.leaseweb.com>
Committed: Thu Dec 3 09:11:00 2015 +0100

----------------------------------------------------------------------
 ui/scripts/accounts.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9cc5551/ui/scripts/accounts.js
----------------------------------------------------------------------
diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index f0c0bff..be620a4 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,


Mime
View raw message