Browse Source

Merge pull request #131 from alfsch/master

 Fix for Issue 356 - LDAP Groupmembers are not displayed until they are signed in once
tags/v1.4.0
James Moger 10 years ago
parent
commit
1dda945c4e
1 changed files with 10 additions and 6 deletions
  1. 10
    6
      src/main/java/com/gitblit/ConfigUserService.java

+ 10
- 6
src/main/java/com/gitblit/ConfigUserService.java View File

@@ -216,18 +216,22 @@ public class ConfigUserService implements IUserService {
// null check on "final" teams because JSON-sourced UserModel
// can have a null teams object
if (model.teams != null) {
Set<TeamModel> userTeams = new HashSet<TeamModel>();
for (TeamModel team : model.teams) {
TeamModel t = teams.get(team.name.toLowerCase());
if (t == null) {
// new team
team.addUser(model.username);
teams.put(team.name.toLowerCase(), team);
} else {
// do not clobber existing team definition
// maybe because this is a federated user
t.addUser(model.username);
t = team;
teams.put(team.name.toLowerCase(), t);
}
// do not clobber existing team definition
// maybe because this is a federated user
t.addUser(model.username);
userTeams.add(t);
}
// replace Team-Models in users by new ones.
model.teams.clear();
model.teams.addAll(userTeams);
// check for implicit team removal
if (originalUser != null) {

Loading…
Cancel
Save