From d376abaca317746fed3b557045432302b8f0b82f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 30 Sep 2011 19:49:03 -0400
Subject: [PATCH] Clarified page hierarchy. Fixed TicGit pages.
---
src/com/gitblit/wicket/AuthorizationStrategy.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/wicket/AuthorizationStrategy.java b/src/com/gitblit/wicket/AuthorizationStrategy.java
index 42d2522..19bee6d 100644
--- a/src/com/gitblit/wicket/AuthorizationStrategy.java
+++ b/src/com/gitblit/wicket/AuthorizationStrategy.java
@@ -22,7 +22,8 @@
import com.gitblit.GitBlit;
import com.gitblit.Keys;
-import com.gitblit.wicket.models.UserModel;
+import com.gitblit.models.UserModel;
+import com.gitblit.wicket.pages.BasePage;
import com.gitblit.wicket.pages.RepositoriesPage;
public class AuthorizationStrategy extends AbstractPageAuthorizationStrategy implements
@@ -46,7 +47,7 @@
}
UserModel user = session.getUser();
- if (pageClass.isAnnotationPresent(AdminPage.class)) {
+ if (pageClass.isAnnotationPresent(RequiresAdminRole.class)) {
// admin page
if (allowAdmin) {
if (authenticateAdmin) {
@@ -71,12 +72,7 @@
@Override
public void onUnauthorizedInstantiation(Component component) {
if (component instanceof BasePage) {
- GitBlitWebSession session = GitBlitWebSession.get();
- if (!session.isLoggedIn()) {
- throw new RestartResponseAtInterceptPageException(LoginPage.class);
- } else {
- throw new RestartResponseAtInterceptPageException(RepositoriesPage.class);
- }
+ throw new RestartResponseAtInterceptPageException(RepositoriesPage.class);
}
}
}
--
Gitblit v1.9.1