RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bug #1333: Fix issue as property and search query are needed for group strategy too

Browse source 
FEA: ItEr76S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-01-12 10:53:30 +01:00
parent deee4e8bd3
commit 71647c475e
3 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
View file

@ -117,10 +117,6 @@ public class ConfigurationController extends GenericForwardComposer {
private Textbox ldapGroupPath;
private Textbox ldapRoleProperty;
private Textbox ldapSearchQuery;
private Radiogroup strategy;
@Override
@ -161,13 +157,9 @@ public class ConfigurationController extends GenericForwardComposer {
if (getLdapConfiguration().getLdapGroupStrategy()) {
strategy.setSelectedIndex(0);
ldapGroupPath.setDisabled(false);
ldapSearchQuery.setDisabled(true);
ldapRoleProperty.setDisabled(true);
} else {
strategy.setSelectedIndex(1);
ldapGroupPath.setDisabled(true);
ldapSearchQuery.setDisabled(false);
ldapRoleProperty.setDisabled(false);
}
}

3
libreplan-webapp/src/main/java/org/libreplan/web/users/services/LDAPCustomAuthenticationProvider.java
View file

@ -341,14 +341,13 @@ public class LDAPCustomAuthenticationProvider extends
String queryRoles = configuration.getLdapSearchQuery().replace(
USER_ID_SUBSTITUTION, username);
String groupsPath = configuration.getLdapGroupPath();
Set<ConfigurationRolesLDAP> rolesLdap = configuration
.getConfigurationRolesLdap();
try {
if (null == groupsPath || groupsPath.isEmpty()) {
if (!configuration.getLdapGroupStrategy()) {
// The LDAP has a node strategy for groups,
// we must check the roleProperty in user node.
return getRolesUsingNodeStrategy(rolesLdap, queryRoles,

6
libreplan-webapp/src/main/webapp/common/configuration.zul
View file

@ -348,16 +348,14 @@
<row>
<label value="${i18n:_('Role property')}" />
<hbox>
<textbox id="ldapRoleProperty" value="@{configurationController.ldapConfiguration.ldapRoleProperty}" width="300px"
disabled="@{configurationController.ldapGroupStrategy}" />
<textbox id="ldapRoleProperty" value="@{configurationController.ldapConfiguration.ldapRoleProperty}" width="300px" />
<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"
disabled="@{configurationController.ldapGroupStrategy}" />
<textbox id="ldapSearchQuery" value="@{configurationController.ldapConfiguration.ldapSearchQuery}" width="300px" />
<label value="${i18n:__('Example: {0}', 'uid=[USER_ID],ou=people,dc=example,dc=org')}" />
</hbox>
</row>