From 45347a60645625d6634767d1b63753de416d215c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 09 May 2014 08:06:24 -0400
Subject: [PATCH] Merge branch 'ticket/69' into develop
---
src/main/java/com/gitblit/models/TeamModel.java | 40 ++++++++--------------------------------
1 files changed, 8 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/gitblit/models/TeamModel.java b/src/main/java/com/gitblit/models/TeamModel.java
index 54f194b..f4a484c 100644
--- a/src/main/java/com/gitblit/models/TeamModel.java
+++ b/src/main/java/com/gitblit/models/TeamModel.java
@@ -27,9 +27,9 @@
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;
import com.gitblit.utils.StringUtils;
/**
@@ -48,6 +48,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,37 +60,8 @@
public TeamModel(String name) {
this.name = name;
+ this.accountType = AccountType.LOCAL;
}
-
- /**
- * @use hasRepositoryPermission
- * @param name
- * @return
- */
- @Deprecated
- @Unused
- public boolean hasRepository(String name) {
- return hasRepositoryPermission(name);
- }
-
- @Deprecated
- @Unused
- public void addRepository(String name) {
- addRepositoryPermission(name);
- }
-
- @Deprecated
- @Unused
- public void addRepositories(Collection<String> names) {
- addRepositoryPermissions(names);
- }
-
- @Deprecated
- @Unused
- public void removeRepository(String name) {
- removeRepositoryPermission(name);
- }
-
/**
* Returns a list of repository permissions for this team.
@@ -206,7 +178,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 +330,10 @@
}
}
+ public boolean isLocalTeam() {
+ return accountType.isLocal();
+ }
+
@Override
public String toString() {
return name;
--
Gitblit v1.9.1