You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2013/01/04 08:28:07 UTC
[1/6] git commit: UI: add generate key button to appropriate roles
UI: add generate key button to appropriate roles
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6ce01c46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6ce01c46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6ce01c46
Branch: refs/heads/api_refactoring
Commit: 6ce01c46fc73a2753e540130bdce194a3ce57dea
Parents: cc3d692
Author: Isaac Chiang <is...@gmail.com>
Authored: Wed Jan 2 10:50:06 2013 +0800
Committer: Rohit Yadav <bh...@apache.org>
Committed: Thu Jan 3 10:58:13 2013 -0800
----------------------------------------------------------------------
client/tomcatconf/commands.properties.in | 2 +-
ui/scripts/accounts.js | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6ce01c46/client/tomcatconf/commands.properties.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index e55017c..27e0c2f 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -260,7 +260,7 @@ migrateVolume=com.cloud.api.commands.MigrateVolumeCmd;15
#### use that key...the key is stored in the db associated w/
#### the userId...every request to the developer API should be
#### checked against the key
-registerUserKeys=com.cloud.api.commands.RegisterCmd;1
+registerUserKeys=com.cloud.api.commands.RegisterCmd;15
### async-query command
queryAsyncJobResult=com.cloud.api.commands.QueryAsyncJobResultCmd;15
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6ce01c46/ui/scripts/accounts.js
----------------------------------------------------------------------
diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index ba741a4..de8149f 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -1282,6 +1282,7 @@
} else {
if(isSelfOrChildDomainUser(jsonObj.username, jsonObj.accounttype, jsonObj.domainid, jsonObj.iscallerchilddomain)) {
allowedActions.push("changePassword");
+ allowedActions.push("generateKeys");
}
}
return allowedActions;