Browse Source

Now only shows the "my tickets" button in the navbar if you are connected.

Redirects to the main page if you try going on "/mytickets" when not connected (or if you disconnect while being on "/mytickets").
tags/v1.6.0
Hybris95 10 years ago
parent
commit
4640f1b689

+ 4
- 2
src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java View File

@@ -34,12 +34,14 @@ public class MyTicketsPage extends RootPage {
public MyTicketsPage(PageParameters params)
{
super();
super(params);
setupPage("", getString("gb.mytickets"));
UserModel currentUser = GitBlitWebSession.get().getUser();
if (currentUser == null) {
currentUser = UserModel.ANONYMOUS;
setRedirect(true);
setResponsePage(getApplication().getHomePage());
return;
}
String username = currentUser.getName();

+ 11
- 6
src/main/java/com/gitblit/wicket/pages/RootPage.java View File

@@ -134,6 +134,8 @@ public abstract class RootPage extends BasePage {
boolean authenticateView = app().settings().getBoolean(Keys.web.authenticateViewPages, false);
boolean authenticateAdmin = app().settings().getBoolean(Keys.web.authenticateAdminPages, true);
boolean allowAdmin = app().settings().getBoolean(Keys.web.allowAdministration, true);
boolean allowLucene = app().settings().getBoolean(Keys.web.allowLuceneIndexing, true);
boolean isLoggedIn = GitBlitWebSession.get().isLoggedIn();
if (authenticateAdmin) {
showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();
@@ -151,7 +153,7 @@ public abstract class RootPage extends BasePage {
}
if (authenticateView || authenticateAdmin) {
if (GitBlitWebSession.get().isLoggedIn()) {
if (isLoggedIn) {
UserMenu userFragment = new UserMenu("userPanel", "userMenuFragment", RootPage.this);
add(userFragment);
} else {
@@ -167,14 +169,17 @@ public abstract class RootPage extends BasePage {
// navigation links
List<PageRegistration> pages = new ArrayList<PageRegistration>();
if (!authenticateView || (authenticateView && GitBlitWebSession.get().isLoggedIn())) {
pages.add(new PageRegistration(GitBlitWebSession.get().isLoggedIn() ? "gb.myDashboard" : "gb.dashboard", MyDashboardPage.class,
if (!authenticateView || (authenticateView && isLoggedIn)) {
pages.add(new PageRegistration(isLoggedIn ? "gb.myDashboard" : "gb.dashboard", MyDashboardPage.class,
getRootPageParameters()));
pages.add(new PageRegistration("gb.repositories", RepositoriesPage.class,
getRootPageParameters()));
pages.add(new PageRegistration("gb.activity", ActivityPage.class, getRootPageParameters()));
pages.add(new PageRegistration("gb.mytickets", MyTicketsPage.class, getRootPageParameters()));
if (app().settings().getBoolean(Keys.web.allowLuceneIndexing, true)) {
if(isLoggedIn)
{
pages.add(new PageRegistration("gb.mytickets", MyTicketsPage.class, getRootPageParameters()));
}
if (allowLucene) {
pages.add(new PageRegistration("gb.search", LuceneSearchPage.class));
}
if (showAdmin) {
@@ -184,7 +189,7 @@ public abstract class RootPage extends BasePage {
pages.add(new PageRegistration("gb.federation", FederationPage.class));
}
if (!authenticateView || (authenticateView && GitBlitWebSession.get().isLoggedIn())) {
if (!authenticateView || (authenticateView && isLoggedIn)) {
addDropDownMenus(pages);
}
}

Loading…
Cancel
Save