diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-04 13:48:10 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-04 13:48:10 -0400 |
| commit | 29183e1b834195122da19bc3112e85bf3280f541 (patch) | |
| tree | 4291bff92657138e07bd072da4ca4a3798094c3c | |
| parent | 86792760339ddf34c117a26f4cca8d296dbede7a (diff) | |
| parent | dd2dc35d6bc2776718cc70ecbd47b225d818ab17 (diff) | |
| download | gitblit-29183e1b834195122da19bc3112e85bf3280f541.tar.gz gitblit-29183e1b834195122da19bc3112e85bf3280f541.zip | |
Merge branch 'ticket/150' into develop
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java index a1c37385..b5c46ac2 100644 --- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java +++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java @@ -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) {
|