James Moger
2014-01-10 1dda945c4e8f882c953ac09c70bc6af8232a62e1
Merge pull request #131 from alfsch/master

Fix for issue-356 - LDAP Groupmembers are not displayed until they are signed in once
1 files modified
16 ■■■■■ changed files
src/main/java/com/gitblit/ConfigUserService.java 16 ●●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/ConfigUserService.java
@@ -216,18 +216,22 @@
                // 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) {