From f76fee63ed9cb3a30d3c0c092d860b1cb93a481b Mon Sep 17 00:00:00 2001
From: Gerard Smyth <gerard.smyth@gmail.com>
Date: Thu, 08 May 2014 13:09:30 -0400
Subject: [PATCH] Updated the SyndicationServlet to provide an additional option to return details of the tags in the repository instead of the commits. This uses a new 'ot' request parameter to indicate the object type of the content to return, which can be ither TAG or COMMIT. If this is not provided, then COMMIT is assumed to maintain backwards compatability. If tags are returned, then the paging parameters, 'l' and 'pg' are still supported, but searching options are currently ignored.
---
src/main/java/com/gitblit/models/RegistrantAccessPermission.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/gitblit/models/RegistrantAccessPermission.java b/src/main/java/com/gitblit/models/RegistrantAccessPermission.java
index 8f4049a..a7fcde4 100644
--- a/src/main/java/com/gitblit/models/RegistrantAccessPermission.java
+++ b/src/main/java/com/gitblit/models/RegistrantAccessPermission.java
@@ -24,7 +24,7 @@
/**
* Represents a Registrant-AccessPermission tuple.
- *
+ *
* @author James Moger
*/
public class RegistrantAccessPermission implements Serializable, Comparable<RegistrantAccessPermission> {
@@ -37,7 +37,7 @@
public PermissionType permissionType;
public boolean mutable;
public String source;
-
+
public RegistrantAccessPermission() {
}
@@ -46,7 +46,7 @@
this.permissionType = PermissionType.EXPLICIT;
this.mutable = true;
}
-
+
public RegistrantAccessPermission(String registrant, AccessPermission permission, PermissionType permissionType, RegistrantType registrantType, String source, boolean mutable) {
this.registrant = registrant;
this.permission = permission;
@@ -55,7 +55,7 @@
this.source = source;
this.mutable = mutable;
}
-
+
public boolean isAdmin() {
return PermissionType.ADMINISTRATOR.equals(permissionType);
}
@@ -63,7 +63,7 @@
public boolean isOwner() {
return PermissionType.OWNER.equals(permissionType);
}
-
+
public boolean isExplicit() {
return PermissionType.EXPLICIT.equals(permissionType);
}
@@ -79,7 +79,7 @@
public boolean isMissing() {
return PermissionType.MISSING.equals(permissionType);
}
-
+
public int getScore() {
switch (registrantType) {
case REPOSITORY:
@@ -102,7 +102,7 @@
return 0;
}
}
-
+
@Override
public int compareTo(RegistrantAccessPermission p) {
switch (registrantType) {
@@ -113,7 +113,7 @@
int score2 = p.getScore();
if (score1 <= 2 && score2 <= 2) {
// group admin, owner, and explicit together
- return StringUtils.compareRepositoryNames(registrant, p.registrant);
+ return StringUtils.compareRepositoryNames(registrant, p.registrant);
}
if (score1 < score2) {
return -1;
@@ -126,22 +126,22 @@
return registrant.toLowerCase().compareTo(p.registrant.toLowerCase());
}
}
-
+
@Override
public int hashCode() {
return registrant.hashCode();
}
-
+
@Override
public boolean equals(Object o) {
if (o instanceof RegistrantAccessPermission) {
RegistrantAccessPermission p = (RegistrantAccessPermission) o;
return registrant.equals(p.registrant);
}
-
+
return false;
}
-
+
@Override
public String toString() {
return permission.asRole(registrant);
--
Gitblit v1.9.1