From 859deba551b5e6850fb6331084493a402cecce45 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 05 May 2014 11:19:31 -0400
Subject: [PATCH] Integrate admin menu into user menu and add user menu extension
---
src/main/java/com/gitblit/wicket/pages/UserPage.java | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/UserPage.java b/src/main/java/com/gitblit/wicket/pages/UserPage.java
index 1e5ddcf..0767621 100644
--- a/src/main/java/com/gitblit/wicket/pages/UserPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/UserPage.java
@@ -29,6 +29,7 @@
import org.eclipse.jgit.lib.PersonIdent;
import com.gitblit.Keys;
+import com.gitblit.models.Menu.ParameterMenuItem;
import com.gitblit.models.ProjectModel;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
@@ -37,7 +38,6 @@
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.GitblitRedirectException;
import com.gitblit.wicket.PageRegistration;
-import com.gitblit.wicket.PageRegistration.DropDownMenuItem;
import com.gitblit.wicket.PageRegistration.DropDownMenuRegistration;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.GravatarImage;
@@ -81,13 +81,6 @@
if (user == null) {
// construct a temporary user model
user = new UserModel(userName);
- }
-
- String projectName = user.getPersonalPath();
-
- ProjectModel project = app().projects().getProjectModel(projectName);
- if (project == null) {
- project = new ProjectModel(projectName);
}
add(new Label("userDisplayName", user.getDisplayName()));
@@ -147,7 +140,7 @@
if (menu.menuItems.size() > 0) {
// Reset Filter
- menu.menuItems.add(new DropDownMenuItem(getString("gb.reset"), null, null));
+ menu.menuItems.add(new ParameterMenuItem(getString("gb.reset")));
}
pages.add(menu);
--
Gitblit v1.9.1