From 3f5b8f5d9203aa7ffb7fbe9cdbaf9dba3da6cae6 Mon Sep 17 00:00:00 2001
From: Hybris95 <hybris_95@hotmail.com>
Date: Thu, 01 May 2014 16:14:15 -0400
Subject: [PATCH] Fixes sort, page building and search functions on "my tickets" page.
---
src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
index f860eeb..cd0da5f 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -339,7 +339,9 @@
// set author metric exclusions
String ax = metricAuthorExclusions.getObject();
- if (!StringUtils.isEmpty(ax)) {
+ if (StringUtils.isEmpty(ax)) {
+ repositoryModel.metricAuthorExclusions = new ArrayList<String>();
+ } else {
Set<String> list = new HashSet<String>();
for (String exclusion : StringUtils.getStringsFromValue(ax, " ")) {
if (StringUtils.isEmpty(exclusion)) {
@@ -356,7 +358,9 @@
// set mailing lists
String ml = mailingLists.getObject();
- if (!StringUtils.isEmpty(ml)) {
+ if (StringUtils.isEmpty(ml)) {
+ repositoryModel.mailingLists = new ArrayList<String>();
+ } else {
Set<String> list = new HashSet<String>();
for (String address : ml.split("(,|\\s)")) {
if (StringUtils.isEmpty(address)) {
@@ -423,7 +427,11 @@
return;
}
setRedirect(false);
- setResponsePage(RepositoriesPage.class);
+ if (isCreate) {
+ setResponsePage(RepositoriesPage.class);
+ } else {
+ setResponsePage(SummaryPage.class, WicketUtils.newRepositoryParameter(repositoryModel.name));
+ }
}
};
@@ -596,7 +604,11 @@
@Override
public void onSubmit() {
- setResponsePage(RepositoriesPage.class);
+ if (isCreate) {
+ setResponsePage(RepositoriesPage.class);
+ } else {
+ setResponsePage(SummaryPage.class, WicketUtils.newRepositoryParameter(repositoryModel.name));
+ }
}
};
cancel.setDefaultFormProcessing(false);
--
Gitblit v1.9.1