From f6b9cd98683f19489b10ea6153d2585cb306e88e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 15 May 2013 17:31:16 -0400
Subject: [PATCH] Fixed regression in repository url panel layout
---
src/main/java/com/gitblit/Constants.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index 7663f8b..0514045 100644
--- a/src/main/java/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -56,7 +56,9 @@
public static final String RPC_PATH = "/rpc/";
- public static final String PAGES= "/pages/";
+ public static final String PAGES = "/pages/";
+
+ public static final String SPARKLESHARE_INVITE_PATH = "/sparkleshare/";
public static final String BORDER = "***********************************************************";
@@ -146,6 +148,28 @@
public String toString() {
return name();
+ }
+
+ public boolean isValidPermission(AccessPermission permission) {
+ switch (this) {
+ case VIEW:
+ // VIEW restriction
+ // all access permissions are valid
+ return true;
+ case CLONE:
+ // CLONE restriction
+ // only CLONE or greater access permissions are valid
+ return permission.atLeast(AccessPermission.CLONE);
+ case PUSH:
+ // PUSH restriction
+ // only PUSH or greater access permissions are valid
+ return permission.atLeast(AccessPermission.PUSH);
+ case NONE:
+ // NO access restriction
+ // all access permissions are invalid
+ return false;
+ }
+ return false;
}
}
@@ -361,7 +385,11 @@
private AccessPermission(String code) {
this.code = code;
}
-
+
+ public boolean atMost(AccessPermission perm) {
+ return ordinal() <= perm.ordinal();
+ }
+
public boolean atLeast(AccessPermission perm) {
return ordinal() >= perm.ordinal();
}
@@ -416,7 +444,7 @@
}
public static enum PermissionType {
- MISSING, EXPLICIT, TEAM, REGEX, OWNER, ADMINISTRATOR;
+ MISSING, ANONYMOUS, EXPLICIT, TEAM, REGEX, OWNER, ADMINISTRATOR;
}
public static enum GCStatus {
--
Gitblit v1.9.1