From 5ae529ea8a73edc8e2bb1e7f9576e51c9d870224 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 11:05:51 -0500
Subject: [PATCH] Change IGitblit API to be more distinct from IUserService
---
src/main/java/com/gitblit/models/TeamModel.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/models/TeamModel.java b/src/main/java/com/gitblit/models/TeamModel.java
index 54f194b..aaa3d54 100644
--- a/src/main/java/com/gitblit/models/TeamModel.java
+++ b/src/main/java/com/gitblit/models/TeamModel.java
@@ -27,6 +27,7 @@
import com.gitblit.Constants.AccessPermission;
import com.gitblit.Constants.AccessRestrictionType;
+import com.gitblit.Constants.AccountType;
import com.gitblit.Constants.PermissionType;
import com.gitblit.Constants.RegistrantType;
import com.gitblit.Constants.Unused;
@@ -48,6 +49,7 @@
public boolean canAdmin;
public boolean canFork;
public boolean canCreate;
+ public AccountType accountType;
public final Set<String> users = new HashSet<String>();
// retained for backwards-compatibility with RPC clients
@Deprecated
@@ -59,6 +61,7 @@
public TeamModel(String name) {
this.name = name;
+ this.accountType = AccountType.LOCAL;
}
/**
@@ -206,7 +209,7 @@
// determine maximum permission for the repository
final AccessPermission maxPermission =
- (repository.isFrozen || !repository.isBare) ?
+ (repository.isFrozen || !repository.isBare || repository.isMirror) ?
AccessPermission.CLONE : AccessPermission.REWIND;
if (AccessRestrictionType.NONE.equals(repository.accessRestriction)) {
@@ -358,6 +361,10 @@
}
}
+ public boolean isLocalTeam() {
+ return accountType.isLocal();
+ }
+
@Override
public String toString() {
return name;
--
Gitblit v1.9.1