Merge pull request #12 from jcrygier/ldap_unboundid

Ldap unboundid

1 files changed, 26 insertions, 1 deletions

diff --git a/src/com/gitblit/FileUserService.java b/src/com/gitblit/FileUserService.java
index 7842c31d..b8d4a40e 100644
--- a/src/com/gitblit/FileUserService.java
+++ b/src/com/gitblit/FileUserService.java
@@ -74,6 +74,27 @@ public class FileUserService extends FileSettings implements IUserService {
 	}

 

 	/**

+	 * Does the user service support changes to credentials?

+	 * 

+	 * @return true or false

+	 * @since 1.0.0

+	 */

+	@Override

+	public boolean supportsCredentialChanges() {

+		return true;

+	}

+

+	/**

+	 * Does the user service support changes to team memberships?

+	 * 

+	 * @return true or false

+	 * @since 1.0.0

+	 */	

+	public boolean supportsTeamMembershipChanges() {

+		return true;

+	}

+

+	/**

 	 * Does the user service support cookie authentication?

 	 * 

 	 * @return true or false

@@ -233,7 +254,9 @@ public class FileUserService extends FileSettings implements IUserService {
 			}

 

 			StringBuilder sb = new StringBuilder();

-			sb.append(model.password);

+			if (!StringUtils.isEmpty(model.password)) {

+				sb.append(model.password);

+			}

 			sb.append(',');

 			for (String role : roles) {

 				sb.append(role);

@@ -658,6 +681,8 @@ public class FileUserService extends FileSettings implements IUserService {
 					team.addRepositories(repositories);

 					team.addUsers(users);

 					team.addMailingLists(mailingLists);

+					team.preReceiveScripts.addAll(preReceive);

+					team.postReceiveScripts.addAll(postReceive);

 					teams.put(team.name.toLowerCase(), team);

 				} else {

 					// user definition