From 3eb83d71a5a1ed8385a606c7bdede066b1a00d72 Mon Sep 17 00:00:00 2001
From: saheba <mail@saheba.net>
Date: Mon, 25 Mar 2013 16:32:06 -0400
Subject: [PATCH] added attribute useIncrementalRevisionNumbers to repository model
---
src/com/gitblit/FileUserService.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/com/gitblit/FileUserService.java b/src/com/gitblit/FileUserService.java
index d411b68..32c24cc 100644
--- a/src/com/gitblit/FileUserService.java
+++ b/src/com/gitblit/FileUserService.java
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.text.MessageFormat;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -270,12 +271,12 @@
/**
* Updates/writes all specified user objects.
*
- * @param model a list of user models
+ * @param models a list of user models
* @return true if update is successful
* @since 1.2.0
*/
@Override
- public boolean updateUserModels(List<UserModel> models) {
+ public boolean updateUserModels(Collection<UserModel> models) {
try {
Properties allUsers = read();
for (UserModel model : models) {
@@ -329,8 +330,7 @@
UserModel oldUser = getUserModel(username);
List<String> roles;
if (model.permissions == null) {
- // legacy, use repository list
- roles = new ArrayList<String>(model.repositories);
+ roles = new ArrayList<String>();
} else {
// discrete repository permissions
roles = new ArrayList<String>();
@@ -797,7 +797,10 @@
repositories.add(role);
}
}
- team.addRepositoryPermissions(repositories);
+ if (!team.canAdmin) {
+ // only read permissions for non-admin teams
+ team.addRepositoryPermissions(repositories);
+ }
team.addUsers(users);
team.addMailingLists(mailingLists);
team.preReceiveScripts.addAll(preReceive);
@@ -995,7 +998,7 @@
* @return true if update is successful
* @since 1.2.0
*/
- public boolean updateTeamModels(List<TeamModel> models) {
+ public boolean updateTeamModels(Collection<TeamModel> models) {
try {
Properties allUsers = read();
for (TeamModel model : models) {
--
Gitblit v1.9.1