Browse Source

Merge branch 'ticket/150' into develop

tags/v1.7.0
James Moger 9 years ago
parent
commit
29183e1b83
1 changed files with 5 additions and 2 deletions
  1. 5
    2
      src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java

+ 5
- 2
src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java View File

@@ -186,15 +186,18 @@ public class EditRepositoryPage extends RootSubPage {
// owners palette
List<UserChoice> owners = new ArrayList<UserChoice>();
List<UserChoice> persons = new ArrayList<UserChoice>();
for (String owner : repositoryModel.owners) {
UserModel o = app().users().getUserModel(owner);
if (o != null) {
owners.add(new UserChoice(o.getDisplayName(), o.username, o.emailAddress));
} 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()) {
UserModel o = app().users().getUserModel(person);
if (o != null) {

Loading…
Cancel
Save