Ver código fonte

Merge branch 'ticket/150' into develop

tags/v1.7.0
James Moger 9 anos atrás
pai
commit
29183e1b83

+ 5
- 2
src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java Ver arquivo

// owners palette // owners palette
List<UserChoice> owners = new ArrayList<UserChoice>(); List<UserChoice> owners = new ArrayList<UserChoice>();
List<UserChoice> persons = new ArrayList<UserChoice>();
for (String owner : repositoryModel.owners) { for (String owner : repositoryModel.owners) {
UserModel o = app().users().getUserModel(owner); UserModel o = app().users().getUserModel(owner);
if (o != null) { if (o != null) {
owners.add(new UserChoice(o.getDisplayName(), o.username, o.emailAddress)); owners.add(new UserChoice(o.getDisplayName(), o.username, o.emailAddress));
} else { } else {
owners.add(new UserChoice(owner));
UserChoice userChoice = new UserChoice(owner);
owners.add(userChoice);
persons.add(userChoice);
} }
} }
List<UserChoice> persons = new ArrayList<UserChoice>();
for (String person : app().users().getAllUsernames()) { for (String person : app().users().getAllUsernames()) {
UserModel o = app().users().getUserModel(person); UserModel o = app().users().getUserModel(person);
if (o != null) { if (o != null) {

Carregando…
Cancelar
Salvar