diff options
Diffstat (limited to 'src/main/java/com/gitblit/wicket/pages/RootPage.java')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/RootPage.java | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java index b48f7224..6ed5a357 100644 --- a/src/main/java/com/gitblit/wicket/pages/RootPage.java +++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java @@ -185,6 +185,11 @@ public abstract class RootPage extends BasePage { // navigation links List<NavLink> navLinks = new ArrayList<NavLink>(); if (!authenticateView || (authenticateView && isLoggedIn)) { + UserModel user = UserModel.ANONYMOUS; + if (isLoggedIn) { + user = GitBlitWebSession.get().getUser(); + } + navLinks.add(new PageNavLink(isLoggedIn ? "gb.myDashboard" : "gb.dashboard", MyDashboardPage.class, getRootPageParameters())); if (isLoggedIn && app().tickets().isReady()) { @@ -192,7 +197,9 @@ public abstract class RootPage extends BasePage { } navLinks.add(new PageNavLink("gb.repositories", RepositoriesPage.class, getRootPageParameters())); - navLinks.add(new PageNavLink("gb.filestore", FilestorePage.class, getRootPageParameters())); + if (user.canAdmin()) { + navLinks.add(new PageNavLink("gb.filestore", FilestorePage.class, getRootPageParameters())); + } navLinks.add(new PageNavLink("gb.activity", ActivityPage.class, getRootPageParameters())); if (allowLucene) { navLinks.add(new PageNavLink("gb.search", LuceneSearchPage.class)); @@ -202,11 +209,6 @@ public abstract class RootPage extends BasePage { addDropDownMenus(navLinks); } - UserModel user = UserModel.ANONYMOUS; - if (isLoggedIn) { - user = GitBlitWebSession.get().getUser(); - } - // add nav link extensions List<NavLinkExtension> extensions = app().plugins().getExtensions(NavLinkExtension.class); for (NavLinkExtension ext : extensions) { @@ -568,7 +570,7 @@ public abstract class RootPage extends BasePage { char[] password = RootPage.this.password.getObject().toCharArray(); HttpServletRequest request = ((WebRequest)RequestCycle.get().getRequest()).getHttpServletRequest(); - + UserModel user = app().authentication().authenticate(username, password, request.getRemoteAddr()); if (user == null) { error(getString("gb.invalidUsernameOrPassword")); |