From cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 05 Jan 2012 17:34:05 -0500
Subject: [PATCH] Fixed bug in receive hook for repositories in subfolders
---
src/com/gitblit/wicket/panels/BasePanel.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/BasePanel.java b/src/com/gitblit/wicket/panels/BasePanel.java
index 9dda03c..73e1399 100644
--- a/src/com/gitblit/wicket/panels/BasePanel.java
+++ b/src/com/gitblit/wicket/panels/BasePanel.java
@@ -22,9 +22,9 @@
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
+import com.gitblit.Constants;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
-import com.gitblit.utils.JGitUtils.SearchType;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.WicketUtils;
@@ -41,10 +41,10 @@
.getTimezone() : TimeZone.getDefault();
}
- protected void setPersonSearchTooltip(Component component, String value, SearchType searchType) {
- if (searchType.equals(SearchType.AUTHOR)) {
+ protected void setPersonSearchTooltip(Component component, String value, Constants.SearchType searchType) {
+ if (searchType.equals(Constants.SearchType.AUTHOR)) {
WicketUtils.setHtmlTooltip(component, getString("gb.searchForAuthor") + " " + value);
- } else if (searchType.equals(SearchType.COMMITTER)) {
+ } else if (searchType.equals(Constants.SearchType.COMMITTER)) {
WicketUtils.setHtmlTooltip(component, getString("gb.searchForCommitter") + " " + value);
}
}
@@ -72,17 +72,16 @@
private static final long serialVersionUID = 1L;
- public JavascriptTextPrompt(String event, String msg) {
+ private String initialValue = "";
+
+ public JavascriptTextPrompt(String event, String msg, String value) {
super(event, true, new Model<String>(msg));
+ initialValue = value;
}
protected String newValue(final String currentValue, final String message) {
String result = "var userText = prompt('" + message + "','"
- + (currentValue == null ? "" : currentValue) + "'); " + "return userText; ";
- // String result = prefix;
- // if (currentValue != null) {
- // result = prefix + currentValue;
- // }
+ + (initialValue == null ? "" : initialValue) + "'); " + "return userText; ";
return result;
}
}
--
Gitblit v1.9.1