From 83b55b7801cbf1c37971eb530ddf9b0f46a11536 Mon Sep 17 00:00:00 2001 From: Kensuke Matsuzaki <zakki@peppermint.jp> Date: Sun, 25 Mar 2012 17:25:04 -0400 Subject: [PATCH] Add Japanese massages --- src/com/gitblit/wicket/pages/RepositoryPage.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java index cd3c8a2..d90d627 100644 --- a/src/com/gitblit/wicket/pages/RepositoryPage.java +++ b/src/com/gitblit/wicket/pages/RepositoryPage.java @@ -27,7 +27,6 @@ import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.DropDownChoice; -import org.apache.wicket.markup.html.form.StatelessForm; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.markup.html.link.ExternalLink; import org.apache.wicket.markup.html.panel.Fragment; @@ -51,6 +50,7 @@ import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.PageRegistration; import com.gitblit.wicket.PageRegistration.OtherPageLink; +import com.gitblit.wicket.SessionlessForm; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.LinkPanel; import com.gitblit.wicket.panels.NavigationPanel; @@ -314,7 +314,7 @@ return WicketUtils.newObjectParameter(repositoryName, commitId); } - private static class SearchForm extends StatelessForm<Void> implements Serializable { + private class SearchForm extends SessionlessForm<Void> implements Serializable { private static final long serialVersionUID = 1L; private final String repositoryName; @@ -325,7 +325,7 @@ Constants.SearchType.COMMIT); public SearchForm(String id, String repositoryName) { - super(id); + super(id, RepositoryPage.this.getClass(), RepositoryPage.this.getPageParameters()); this.repositoryName = repositoryName; DropDownChoice<Constants.SearchType> searchType = new DropDownChoice<Constants.SearchType>( "searchType", Arrays.asList(Constants.SearchType.values())); @@ -360,7 +360,8 @@ } Class<? extends BasePage> searchPageClass = GitSearchPage.class; RepositoryModel model = GitBlit.self().getRepositoryModel(repositoryName); - if (!ArrayUtils.isEmpty(model.indexedBranches)) { + if (GitBlit.getBoolean(Keys.web.allowLuceneIndexing, true) + && !ArrayUtils.isEmpty(model.indexedBranches)) { // this repository is Lucene-indexed searchPageClass = LuceneSearchPage.class; } -- Gitblit v1.9.1