From 29183e1b834195122da19bc3112e85bf3280f541 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 04 Sep 2014 13:48:10 -0400
Subject: [PATCH] Merge branch 'ticket/150' into develop
---
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 a1c3738..b5c46ac 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 @@
// 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) {
--
Gitblit v1.9.1