From 91aad771ac411b317139bab1b862e9d9cfd4e59d Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Thu, 07 Apr 2016 19:01:14 -0400
Subject: [PATCH] Fixes #1028 - FilestorePage now pages and filters
---
src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
index a0e6e7b..6bcf6f5 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -70,8 +70,8 @@
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.AccessPolicyPanel;
import com.gitblit.wicket.panels.BasePanel.JavascriptEventConfirmation;
-import com.gitblit.wicket.panels.BulletListPanel;
import com.gitblit.wicket.panels.BooleanOption;
+import com.gitblit.wicket.panels.BulletListPanel;
import com.gitblit.wicket.panels.ChoiceOption;
import com.gitblit.wicket.panels.RegistrantPermissionsPanel;
import com.gitblit.wicket.panels.RepositoryNamePanel;
@@ -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) {
@@ -383,7 +386,6 @@
}
} catch (GitBlitException e) {
error(e.getMessage());
- namePanel.resetModel(repositoryModel);
return;
}
setRedirect(false);
@@ -444,7 +446,7 @@
form.add(new BooleanOption("acceptNewTickets",
getString("gb.acceptNewTickets"),
getString("gb.acceptNewTicketsDescription"),
- new PropertyModel<Boolean>(repositoryModel, "acceptNewPatchsets")));
+ new PropertyModel<Boolean>(repositoryModel, "acceptNewTickets")));
form.add(new BooleanOption("requireApproval",
getString("gb.requireApproval"),
@@ -679,7 +681,7 @@
RepositoryModel latestModel = app().repositories().getRepositoryModel(repositoryModel.name);
boolean canDelete = app().repositories().canDelete(latestModel);
if (canDelete) {
- if (app().repositories().deleteRepositoryModel(latestModel)) {
+ if (app().gitblit().deleteRepositoryModel(latestModel)) {
info(MessageFormat.format(getString("gb.repositoryDeleted"), latestModel));
if (latestModel.isPersonalRepository()) {
// redirect to user's profile page
--
Gitblit v1.9.1