cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pran...@apache.org
Subject git commit: refs/heads/master - CLOUDSTACK-1494:ldap tooltips to highlight more information about the query filter
Date Fri, 08 Mar 2013 15:22:56 GMT
Updated Branches:
  refs/heads/master 8e29a030f -> 41ff6588b


CLOUDSTACK-1494:ldap tooltips to highlight more information about the query filter


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

Branch: refs/heads/master
Commit: 41ff6588b580ae3856e81551814997fbb9b067e2
Parents: 8e29a03
Author: Pranav Saxena <pranav.saxena@citrix.com>
Authored: Fri Mar 8 20:52:23 2013 +0530
Committer: Pranav Saxena <pranav.saxena@citrix.com>
Committed: Fri Mar 8 20:52:23 2013 +0530

----------------------------------------------------------------------
 ui/scripts/docs.js           |    9 +++++++++
 ui/scripts/globalSettings.js |    2 +-
 2 files changed, 10 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/41ff6588/ui/scripts/docs.js
----------------------------------------------------------------------
diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js
index 3356ecb..34835d6 100755
--- a/ui/scripts/docs.js
+++ b/ui/scripts/docs.js
@@ -16,6 +16,15 @@
 // under the License.
 cloudStack.docs = {
 
+ //Ldap
+  helpLdapQueryFilter: {
+
+  desc:'Query filter is used to find a mapped user in the external LDAP server.Cloudstack
provides some wildchars to represent the unique attributes in its database . Example - If
Cloudstack account-name is same as the LDAP uid, then following will be a valid filter: Queryfilter
:  (&(uid=%u) ,  Queryfilter: .incase of Active Directory , Email _ID :(&(mail=%e))
, displayName :(&(displayName=%u)',
+
+  externalLink:''
+ },
+
+
   //IP Reservation tooltips
    helpIPReservationCidr: {
      desc:'Edit CIDR when you want to configure IP Reservation in isolated guest Network',

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/41ff6588/ui/scripts/globalSettings.js
----------------------------------------------------------------------
diff --git a/ui/scripts/globalSettings.js b/ui/scripts/globalSettings.js
index 912dde7..4c96b5f 100644
--- a/ui/scripts/globalSettings.js
+++ b/ui/scripts/globalSettings.js
@@ -137,7 +137,7 @@
                         name:{label: 'Bind DN' , validation: {required:true} },
                         password: {label: 'Bind Password', validation: {required: true },isPassword:true
},
                         hostname: {label:'Hostname' , validation:{required:true}},
-                        queryfilter: {label:'Query Filter' , validation: {required:true}},
+                        queryfilter: {label:'Query Filter' , validation: {required:true}
, docID:'helpLdapQueryFilter'},
                         searchbase: {label:'SearchBase',validation:{required:true}},
                         ssl:  {
                                label:'SSL' ,


Mime
View raw message