From 41ff6588b580ae3856e81551814997fbb9b067e2 Mon Sep 17 00:00:00 2001 From: Pranav Saxena Date: Fri, 8 Mar 2013 20:52:23 +0530 Subject: [PATCH] CLOUDSTACK-1494:ldap tooltips to highlight more information about the query filter --- ui/scripts/docs.js | 9 +++++++++ ui/scripts/globalSettings.js | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js index 3356ecb866e..34835d6fc95 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', diff --git a/ui/scripts/globalSettings.js b/ui/scripts/globalSettings.js index 912dde7d86b..4c96b5feda5 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' ,