You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/02/19 12:24:15 UTC
[4/6] git commit: refs/heads/master - LDAP-UI integration code
LDAP-UI integration code
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bff3d8ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/bff3d8ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/bff3d8ac
Branch: refs/heads/master
Commit: bff3d8ac9a0566addeb24d4c4c16ceab99b242b6
Parents: d8537a4
Author: Pranav Saxena <pr...@citrix.com>
Authored: Tue Feb 19 16:40:47 2013 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Tue Feb 19 16:40:47 2013 +0530
----------------------------------------------------------------------
ui/scripts/globalSettings.js | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bff3d8ac/ui/scripts/globalSettings.js
----------------------------------------------------------------------
diff --git a/ui/scripts/globalSettings.js b/ui/scripts/globalSettings.js
index 5f7fb74..598c9c5 100644
--- a/ui/scripts/globalSettings.js
+++ b/ui/scripts/globalSettings.js
@@ -97,19 +97,17 @@
ssl: {
label: 'SSL'
-
}
-
},
dataProvider:function(args){
var data = {};
listViewDataProvider(args, data);
$.ajax({
- url: createURL(''), //Need a list LDAP configuration API call which needs to be implemented
+ url: createURL('ldapConfig&listall=true'), //Need a list LDAP configuration API call which needs to be implemented
data: data,
success: function(json) {
- // var items = json.listldapconfigresponse;
+ var items = json.ldapconfigresponse.ldapconfig;
args.response.success({data:items});
},
error: function(data) {
@@ -185,7 +183,7 @@
dataType: "json",
async: true,
success: function(json) {
- var items = json.ldapconfigresponse;
+ var items = json.ldapconfigresponse.ldapconfig;
args.response.success({
data: items
});