From e9de3f7fd55dd4d4535cd7b2fc2bee8094152e39 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 17 Mar 2012 12:09:01 -0400
Subject: [PATCH] Implemented RPC administration of indexed branches
---
src/com/gitblit/wicket/pages/RepositoryPage.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java
index 77918ea..4a83b87 100644
--- a/src/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoryPage.java
@@ -47,6 +47,7 @@
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.utils.TicgitUtils;
+import com.gitblit.wicket.GitBlitWebApp;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.PageRegistration;
import com.gitblit.wicket.PageRegistration.OtherPageLink;
@@ -156,9 +157,11 @@
if (getRepositoryModel().isBare) {
add(new Label("workingCopy").setVisible(false));
} else {
+ Fragment fragment = new Fragment("workingCopy", "workingCopyFragment", this);
Label lbl = new Label("workingCopy", getString("gb.workingCopy"));
WicketUtils.setHtmlTooltip(lbl, getString("gb.workingCopyWarning"));
- add(lbl);
+ fragment.add(lbl);
+ add(fragment);
}
super.setupPage(repositoryName, pageName);
@@ -226,6 +229,8 @@
protected Component createPersonPanel(String wicketId, PersonIdent identity,
Constants.SearchType searchType) {
+ GitBlitWebApp app = (GitBlitWebApp) GitBlitWebSession.get().getApplication();
+ final Class<? extends BasePage> searchPageClass = app.getSearchPageClass();
String name = identity == null ? "" : identity.getName();
String address = identity == null ? "" : identity.getEmailAddress();
boolean showEmail = GitBlit.getBoolean(Keys.web.showEmailAddresses, false);
@@ -239,20 +244,20 @@
}
}
Fragment partial = new Fragment(wicketId, "partialPersonIdent", this);
- LinkPanel link = new LinkPanel("personName", "list", value, SearchPage.class,
+ LinkPanel link = new LinkPanel("personName", "list", value, searchPageClass,
WicketUtils.newSearchParameter(repositoryName, objectId, value, searchType));
setPersonSearchTooltip(link, value, searchType);
partial.add(link);
return partial;
} else {
Fragment fullPerson = new Fragment(wicketId, "fullPersonIdent", this);
- LinkPanel nameLink = new LinkPanel("personName", "list", name, SearchPage.class,
+ LinkPanel nameLink = new LinkPanel("personName", "list", name, searchPageClass,
WicketUtils.newSearchParameter(repositoryName, objectId, name, searchType));
setPersonSearchTooltip(nameLink, name, searchType);
fullPerson.add(nameLink);
LinkPanel addressLink = new LinkPanel("personAddress", "list", "<" + address + ">",
- SearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId,
+ searchPageClass, WicketUtils.newSearchParameter(repositoryName, objectId,
address, searchType));
setPersonSearchTooltip(addressLink, address, searchType);
fullPerson.add(addressLink);
@@ -355,7 +360,8 @@
break;
}
}
- setResponsePage(SearchPage.class,
+ GitBlitWebApp app = (GitBlitWebApp) GitBlitWebSession.get().getApplication();
+ setResponsePage(app.getSearchPageClass(),
WicketUtils.newSearchParameter(repositoryName, null, searchString, searchType));
}
}
--
Gitblit v1.9.1