From f4e2a7d8ae296eebb6b694dd57d98a35503f9d63 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Thu, 17 Nov 2011 10:14:27 +0100
Subject: [PATCH] Fix some issues pending in previous commit

* Updated database changelog to set properly the default value of the
  new field.
* Disable some fields in configuration window depending on the LDAP
  strategy selected.

FEA: ItEr74S09LdapAuhentication
---
 .../business/common/entities/LDAPConfiguration.java    |  2 ++
 .../src/main/resources/db.changelog-1.1.xml            |  8 ++++++++
 .../libreplan/web/common/ConfigurationController.java  | 10 ++++++++--
 .../src/main/webapp/common/configuration.zul           |  9 ++++++---
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/entities/LDAPConfiguration.java b/libreplan-business/src/main/java/org/libreplan/business/common/entities/LDAPConfiguration.java
index 7d96d3903..4d390ac5f 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/common/entities/LDAPConfiguration.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/common/entities/LDAPConfiguration.java
@@ -71,6 +71,8 @@ public class LDAPConfiguration extends BaseEntity {
     // LDAP roles will be used or not
     private Boolean ldapSaveRolesDB = false;
 
+    // LDAP strategy if true means group strategy if false means property
+    // strategy
     private Boolean ldapGroupStrategy = true;
 
     /**
diff --git a/libreplan-business/src/main/resources/db.changelog-1.1.xml b/libreplan-business/src/main/resources/db.changelog-1.1.xml
index 9abc53cc3..c5ababa13 100644
--- a/libreplan-business/src/main/resources/db.changelog-1.1.xml
+++ b/libreplan-business/src/main/resources/db.changelog-1.1.xml
@@ -328,5 +328,13 @@
         <addColumn tableName="configuration">
             <column name="ldap_group_strategy" type="BOOLEAN" />
         </addColumn>
+        <addDefaultValue tableName="configuration"
+           columnName="ldap_group_strategy"
+           defaultValueBoolean="TRUE" />
+       <addNotNullConstraint tableName="configuration"
+           columnName="ldap_group_strategy"
+           defaultNullValue="TRUE"
+           columnDataType="BOOLEAN" />
     </changeSet>
+
 </databaseChangeLog>
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
index d72efea56..aa3065c02 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
@@ -113,8 +113,6 @@ public class ConfigurationController extends GenericForwardComposer {
 
     private Checkbox scenariosVisible;
 
-    private Component ldapRoles;
-
     private UserRole roles;
 
     private Textbox ldapGroupPath;
@@ -841,4 +839,12 @@ public class ConfigurationController extends GenericForwardComposer {
         return configurationModel.isChangedDefaultPasswdAdmin();
     }
 
+    public boolean isLdapGroupStrategy() {
+        return getLdapConfiguration().getLdapGroupStrategy();
+    }
+
+    public boolean isLdapPropertyStrategy() {
+        return !getLdapConfiguration().getLdapGroupStrategy();
+    }
+
 }
diff --git a/libreplan-webapp/src/main/webapp/common/configuration.zul b/libreplan-webapp/src/main/webapp/common/configuration.zul
index a1b62c090..9a48e1903 100644
--- a/libreplan-webapp/src/main/webapp/common/configuration.zul
+++ b/libreplan-webapp/src/main/webapp/common/configuration.zul
@@ -340,21 +340,24 @@
                                 <row>
                                     <label value="${i18n:_('Group path')}" />
                                     <hbox>
-                                        <textbox id="ldapGroupPath" value="@{configurationController.ldapConfiguration.ldapGroupPath}"  width="300px"/>
+                                        <textbox id="ldapGroupPath" value="@{configurationController.ldapConfiguration.ldapGroupPath}"  width="300px"
+                                            disabled="@{configurationController.ldapPropertyStrategy}" />
                                         <label value="${i18n:__('Example: {0}', 'ou=groups')}" /><label value="${i18n:_('(If it is empty, a node strategy is used)')}" />
                                     </hbox>
                                 </row>
                                 <row>
                                     <label value="${i18n:_('Role property')}" />
                                     <hbox>
-                                        <textbox id="ldapRoleProperty" value="@{configurationController.ldapConfiguration.ldapRoleProperty}"  width="300px"/>
+                                        <textbox id="ldapRoleProperty" value="@{configurationController.ldapConfiguration.ldapRoleProperty}"  width="300px"
+                                            disabled="@{configurationController.ldapGroupStrategy}" />
                                         <label value="${i18n:__('Example: {0}', 'member')}" />
                                     </hbox>
                                 </row>
                                 <row>
                                     <label value="${i18n:_('Role search query')}" />
                                     <hbox>
-                                        <textbox id="ldapSearchQuery" value="@{configurationController.ldapConfiguration.ldapSearchQuery}"  width="300px"/>
+                                        <textbox id="ldapSearchQuery" value="@{configurationController.ldapConfiguration.ldapSearchQuery}"  width="300px"
+                                            disabled="@{configurationController.ldapGroupStrategy}" />
                                         <label value="${i18n:__('Example: {0}', 'uid=[USER_ID],ou=people,dc=example,dc=org')}" />
                                     </hbox>
                                 </row>