From f5fa7958b07d0e585542b712b13f7ad9b47a8be9 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 23 Dec 2011 08:28:15 -0500 Subject: [PATCH] Improved logging of GitblitUserService --- src/com/gitblit/wicket/pages/RepositoriesPage.java | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java index d5a21a7..a15a7d9 100644 --- a/src/com/gitblit/wicket/pages/RepositoriesPage.java +++ b/src/com/gitblit/wicket/pages/RepositoriesPage.java @@ -20,13 +20,16 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.text.MessageFormat; +import java.util.List; import org.apache.wicket.Component; +import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.resource.ContextRelativeResource; import com.gitblit.GitBlit; import com.gitblit.Keys; +import com.gitblit.models.RepositoryModel; import com.gitblit.utils.MarkdownUtils; import com.gitblit.utils.StringUtils; import com.gitblit.wicket.GitBlitWebSession; @@ -37,8 +40,16 @@ public RepositoriesPage() { super(); - setupPage("", ""); + setup(null); + } + public RepositoriesPage(PageParameters params) { + super(params); + setup(params); + } + + private void setup(PageParameters params) { + setupPage("", ""); // check to see if we should display a login message boolean authenticateView = GitBlit.getBoolean(Keys.web.authenticateViewPages, true); if (authenticateView && !GitBlitWebSession.get().isLoggedIn()) { @@ -56,14 +67,17 @@ Component repositoriesMessage = new Label("repositoriesMessage", message) .setEscapeModelStrings(false).setVisible(message.length() > 0); add(repositoriesMessage); - RepositoriesPanel repositories = new RepositoriesPanel("repositoriesPanel", showAdmin, - null, getAccessRestrictions()); + + List<RepositoryModel> repositories = getRepositories(params); + + RepositoriesPanel repositoriesPanel = new RepositoriesPanel("repositoriesPanel", showAdmin, + repositories, true, getAccessRestrictions()); // push the panel down if we are hiding the admin controls and the // welcome message if (!showAdmin && !repositoriesMessage.isVisible()) { - WicketUtils.setCssStyle(repositories, "padding-top:5px;"); + WicketUtils.setCssStyle(repositoriesPanel, "padding-top:5px;"); } - add(repositories); + add(repositoriesPanel); } private String readMarkdown(String messageSource, String resource) { -- Gitblit v1.9.1