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

Fixed issue if user sets duplicated LDAP roles for the same LibrePlan role.

Browse source 
FEA: ItEr75S06LdapAuhenticationItEr74S09
This commit is contained in:
Manuel Rego Casasnovas 2011-07-07 10:04:01 +02:00
parent 76659e4910
commit aa989b07ae
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -185,8 +185,8 @@ public class LDAPConfiguration extends BaseEntity {
return Collections.unmodifiableSet(configurationRolesLdap);
}
public void setConfigurationRolesLdap(
String roleLibreplan, List<String> rolesLdap) {
public void setConfigurationRolesLdap(String roleLibreplan,
Set<String> rolesLdap) {
removeConfigurationRolesLdapForRoleLibreplan(roleLibreplan);
for (String roleLdap : rolesLdap) {

14
navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
View file

@ -29,6 +29,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.ConcurrentModificationException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@ -818,12 +819,13 @@ public class ConfigurationController extends GenericForwardComposer {
}, new Util.Setter<String>() {
@Override
public void set(String value) {
configurationModel
.getLdapConfiguration()
.setConfigurationRolesLdap(
role.name(),
Arrays.asList(StringUtils
.split(value, ";")));
// Created a set in order to avoid duplicates
Set<String> rolesLdap = new HashSet<String>(
Arrays.asList(StringUtils.split(value,
";")));
configurationModel.getLdapConfiguration()
.setConfigurationRolesLdap(role.name(),
rolesLdap);
}
});
textbox.setWidth("300px");