From fe7c01a8bd76dff240e74bb770212911e227ba59 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 03 Feb 2012 17:24:51 -0500
Subject: [PATCH] Return to Users page after add/edit team
---
src/com/gitblit/GitblitUserService.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/GitblitUserService.java b/src/com/gitblit/GitblitUserService.java
index f675510..7462af0 100644
--- a/src/com/gitblit/GitblitUserService.java
+++ b/src/com/gitblit/GitblitUserService.java
@@ -57,6 +57,7 @@
public void setup(IStoredSettings settings) {
File realmFile = GitBlit.getFileOrFolder(Keys.realm.userService, "users.conf");
serviceImpl = createUserService(realmFile);
+ logger.info("GUS delegating to " + serviceImpl.toString());
}
@SuppressWarnings("deprecation")
@@ -94,8 +95,8 @@
logger.info(MessageFormat.format("Automatically creating {0} based on {1}",
usersConfig.getAbsolutePath(), realmFile.getAbsolutePath()));
ConfigUserService configService = new ConfigUserService(usersConfig);
- for (String username : serviceImpl.getAllUsernames()) {
- UserModel userModel = serviceImpl.getUserModel(username);
+ for (String username : service.getAllUsernames()) {
+ UserModel userModel = service.getUserModel(username);
configService.updateUserModel(userModel);
}
}
@@ -103,6 +104,11 @@
logger.warn("Please consider using \"users.conf\" instead of the deprecated \"users.properties\" file");
}
return service;
+ }
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName();
}
@Override
@@ -156,11 +162,21 @@
}
@Override
+ public List<UserModel> getAllUsers() {
+ return serviceImpl.getAllUsers();
+ }
+
+ @Override
public List<String> getAllTeamNames() {
return serviceImpl.getAllTeamNames();
}
@Override
+ public List<TeamModel> getAllTeams() {
+ return serviceImpl.getAllTeams();
+ }
+
+ @Override
public List<String> getTeamnamesForRepositoryRole(String role) {
return serviceImpl.getTeamnamesForRepositoryRole(role);
}
--
Gitblit v1.9.1