From d0d438f480e29a5ebaf64449a5c3e7f4ebb13690 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 May 2011 22:33:16 -0400
Subject: [PATCH] Clarified access restrictions.
---
src/com/gitblit/wicket/models/UserModel.java | 24 ++----------------------
1 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/src/com/gitblit/wicket/models/UserModel.java b/src/com/gitblit/wicket/models/UserModel.java
index c65d356..34c32e7 100644
--- a/src/com/gitblit/wicket/models/UserModel.java
+++ b/src/com/gitblit/wicket/models/UserModel.java
@@ -4,8 +4,6 @@
import java.util.ArrayList;
import java.util.List;
-import com.gitblit.Constants.AccessRestrictionType;
-
public class UserModel implements Serializable {
private static final long serialVersionUID = 1L;
@@ -39,27 +37,9 @@
public boolean canAdmin() {
return canAdmin;
}
-
- public boolean canClone(RepositoryModel repository) {
- return canAccess(repository, AccessRestrictionType.CLONE);
- }
- public boolean canPush(RepositoryModel repository) {
- return canAccess(repository, AccessRestrictionType.PUSH);
- }
-
- public boolean canView(RepositoryModel repository) {
- return canAccess(repository, AccessRestrictionType.VIEW);
- }
-
- private boolean canAccess(RepositoryModel repository, AccessRestrictionType minimum) {
- if (repository.accessRestriction.atLeast(minimum)) {
- // repository is restricted, must check roles
- return canAdmin || repositories.contains(repository.name);
- } else {
- // repository is not restricted
- return true;
- }
+ public boolean canAccessRepository(String repositoryName) {
+ return canAdmin || repositories.contains(repositoryName);
}
public void setCookie(String cookie) {
--
Gitblit v1.9.1