From 836b117469265beb26e24ff4221aaa6ed64bcdc6 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 04 Jan 2012 20:14:32 -0500
Subject: [PATCH] Fixed wrong include folder to make GO monotlihic (issue 30)
---
src/com/gitblit/GitBlit.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index d82e3c2..89dcbf1 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -449,8 +449,18 @@
*/
public List<String> getAllUsernames() {
List<String> names = new ArrayList<String>(userService.getAllUsernames());
- Collections.sort(names);
return names;
+ }
+
+ /**
+ * Returns the list of all users available to the login service.
+ *
+ * @see IUserService.getAllUsernames()
+ * @return list of all usernames
+ */
+ public List<UserModel> getAllUsers() {
+ List<UserModel> users = userService.getAllUsers();
+ return users;
}
/**
@@ -533,7 +543,17 @@
*/
public List<String> getAllTeamnames() {
List<String> teams = new ArrayList<String>(userService.getAllTeamNames());
- Collections.sort(teams);
+ return teams;
+ }
+
+ /**
+ * Returns the list of available teams that a user or repository may be
+ * assigned to.
+ *
+ * @return the list of teams
+ */
+ public List<TeamModel> getAllTeams() {
+ List<TeamModel> teams = userService.getAllTeams();
return teams;
}
@@ -1233,6 +1253,7 @@
case PULL_TEAMS:
return token.equals(all) || token.equals(unr);
case PULL_SETTINGS:
+ case PULL_SCRIPTS:
return token.equals(all);
}
return false;
--
Gitblit v1.9.1