diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-04 11:56:08 -0600 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-04 11:56:08 -0600 |
| commit | 3a916413835a92706394ec55f177eeb23f709d89 (patch) | |
| tree | 4dd8ce775582ffe460bfa355a3559bebc208a141 | |
| parent | ddcebbd982d81dabf8cb1c89f60f9b876a23b58c (diff) | |
| parent | dd2dc35d6bc2776718cc70ecbd47b225d818ab17 (diff) | |
| download | gitblit-3a916413835a92706394ec55f177eeb23f709d89.tar.gz gitblit-3a916413835a92706394ec55f177eeb23f709d89.zip | |
Merged #150 "Edit repo drops missing owners from owners list"
| -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) {
|