Added column LDAP role search query in LDAPConfiguration

navalplanner-business/src/main/java/org/navalplanner/business/common/entities/LDAPConfiguration.java

@@ -85,6 +85,8 @@ public class LDAPConfiguration extends BaseEntity {
 
     private Map<String, List<String>> mapMatchingRoles = new HashMap<String, List<String>>();
 
+    private String ldapSearchQuery;
+
     public String getLdapUserId() {
         return ldapUserId;
     }
@@ -226,4 +228,18 @@ public class LDAPConfiguration extends BaseEntity {
         this.mapMatchingRoles = mapMatchingRoles;
     }
 
+    /**
+     * @return the ldapSearchQuery
+     */
+    public String getLdapSearchQuery() {
+        return ldapSearchQuery;
+    }
+
+    /**
+     * @param ldapSearchQuery
+     *            the ldapSearchQuery to set
+     */
+    public void setLdapSearchQuery(String ldapSearchQuery) {
+        this.ldapSearchQuery = ldapSearchQuery;
+    }
 }

navalplanner-business/src/main/resources/db.changelog-1.1.xml

@@ -148,5 +148,11 @@
             <column name="ldap_role_property" type="VARCHAR(255)" />
         </addColumn>
     </changeSet>
+    <changeSet id="add-new-column-ldap-search-query" author="idiazt">
+        <comment>Add new column to store ldap role search query</comment>
+        <addColumn tableName="configuration">
+            <column name="ldap_search_query" type="VARCHAR(255)" />
+        </addColumn>
+    </changeSet>
 
 </databaseChangeLog>

navalplanner-business/src/main/resources/org/navalplanner/business/common/entities/Configuration.hbm.xml

@@ -78,6 +78,7 @@
             <property name="ldapSavePasswordsDB" column="ldap_save_password_db" not-null="true"/>
             <property name="ldapAuthEnabled" column="ldap_auth_enabled" not-null="true"/>
             <property name="ldapSaveRolesDB" column="ldap_save_roles_db" not-null="true"/>
+            <property name="ldapSearchQuery" column="ldap_search_query"/>
 
             <list name="configurationRolesLdap" table="configuration_roles_ldap" lazy="false">
                 <key column="id_configuration" />

navalplanner-webapp/src/main/webapp/common/configuration.zul

@@ -361,6 +361,13 @@
                                         <label value="${i18n:__('Example: {0}', 'memberUid')}" />
                                     </hbox>
                                 </row>
+                                <row>
+                                    <label value="${i18n:_('Role search query:')}" />
+                                    <hbox>
+                                        <textbox id="ldapSearchQuery" value="@{configurationController.ldapConfiguration.ldapSearchQuery}"  width="300px"/>
+                                        <label value="${i18n:__('Example: {0}', 'uid=[@user_id],ou=groups,ou=people,dc=example,dc=org')}" />
+                                    </hbox>
+                                </row>
                             </rows>
                         </grid>
                         <separator />