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/ProjectsPage.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/ProjectsPage.java b/src/main/java/com/gitblit/wicket/pages/ProjectsPage.java index d0001ec..77d4984 100644 --- a/src/main/java/com/gitblit/wicket/pages/ProjectsPage.java +++ b/src/main/java/com/gitblit/wicket/pages/ProjectsPage.java @@ -23,7 +23,6 @@ import org.apache.wicket.markup.repeater.data.DataView; import org.apache.wicket.markup.repeater.data.ListDataProvider; -import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.models.ProjectModel; import com.gitblit.wicket.GitBlitWebSession; @@ -49,7 +48,7 @@ protected boolean reusePageParameters() { return true; } - + @Override protected Class<? extends BasePage> getRootNavPageClass() { return RepositoriesPage.class; @@ -57,13 +56,13 @@ @Override protected List<ProjectModel> getProjectModels() { - return GitBlit.self().getProjectModels(getRepositoryModels(), false); + return app().projects().getProjectModels(getRepositoryModels(), false); } private void setup(PageParameters params) { setupPage("", ""); // check to see if we should display a login message - boolean authenticateView = GitBlit.getBoolean(Keys.web.authenticateViewPages, true); + boolean authenticateView = app().settings().getBoolean(Keys.web.authenticateViewPages, true); if (authenticateView && !GitBlitWebSession.get().isLoggedIn()) { add(new Label("projectsPanel")); return; @@ -83,6 +82,7 @@ counter = 0; } + @Override public void populateItem(final Item<ProjectModel> item) { final ProjectModel entry = item.getModelObject(); @@ -117,7 +117,7 @@ @Override protected void addDropDownMenus(List<PageRegistration> pages) { PageParameters params = getPageParameters(); - + DropDownMenuRegistration menu = new DropDownMenuRegistration("gb.filters", ProjectsPage.class); // preserve time filter option on repository choices -- Gitblit v1.9.1