From dd2dc35d6bc2776718cc70ecbd47b225d818ab17 Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 4 Sep 2014 13:46:49 -0400 Subject: [PATCH] Do not drop missing owners from owners palette --- .../java/com/gitblit/wicket/pages/EditRepositoryPage.java | 7 +++++-- 1 file 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 owners = new ArrayList(); + List persons = new ArrayList(); 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 persons = new ArrayList(); + for (String person : app().users().getAllUsernames()) { UserModel o = app().users().getUserModel(person); if (o != null) { -- 2.39.5