From b170c59085538953c95eebe444a839249f25bff8 Mon Sep 17 00:00:00 2001 From: mrbytes <eguervos@msn.com> Date: Mon, 13 Aug 2012 15:52:59 -0400 Subject: [PATCH] GitBlitWebApp_es.properties: up-to date with the last changes --- src/com/gitblit/client/GitblitClient.java | 37 +++++++++++++++++++++++++++++++------ 1 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/com/gitblit/client/GitblitClient.java b/src/com/gitblit/client/GitblitClient.java index d37ee91..5e05fa4 100644 --- a/src/com/gitblit/client/GitblitClient.java +++ b/src/com/gitblit/client/GitblitClient.java @@ -28,6 +28,8 @@ import java.util.TreeSet; import com.gitblit.Constants; +import com.gitblit.Constants.AccessRestrictionType; +import com.gitblit.Constants.AuthorizationControl; import com.gitblit.GitBlitException.ForbiddenException; import com.gitblit.GitBlitException.NotAllowedException; import com.gitblit.GitBlitException.UnauthorizedException; @@ -41,6 +43,7 @@ import com.gitblit.models.ServerStatus; import com.gitblit.models.TeamModel; import com.gitblit.models.UserModel; +import com.gitblit.utils.ArrayUtils; import com.gitblit.utils.RpcUtils; import com.gitblit.utils.StringUtils; import com.gitblit.utils.SyndicationUtils; @@ -184,6 +187,22 @@ return sb.toString(); } } + + public AccessRestrictionType getDefaultAccessRestriction() { + String restriction = null; + if (settings.hasKey(Keys.git.defaultAccessRestriction)) { + restriction = settings.get(Keys.git.defaultAccessRestriction).currentValue; + } + return AccessRestrictionType.fromName(restriction); + } + + public AuthorizationControl getDefaultAuthorizationControl() { + String authorization = null; + if (settings.hasKey(Keys.git.defaultAuthorizationControl)) { + authorization = settings.get(Keys.git.defaultAuthorizationControl).currentValue; + } + return AuthorizationControl.fromName(authorization); + } /** * Returns the list of pre-receive scripts the repository inherited from the @@ -208,7 +227,9 @@ if (repository != null) { for (String teamname : getPermittedTeamnames(repository)) { TeamModel team = getTeamModel(teamname); - scripts.addAll(team.preReceiveScripts); + if (!ArrayUtils.isEmpty(team.preReceiveScripts)) { + scripts.addAll(team.preReceiveScripts); + } } } return new ArrayList<String>(scripts); @@ -258,7 +279,9 @@ if (repository != null) { for (String teamname : getPermittedTeamnames(repository)) { TeamModel team = getTeamModel(teamname); - scripts.addAll(team.postReceiveScripts); + if (!ArrayUtils.isEmpty(team.postReceiveScripts)) { + scripts.addAll(team.postReceiveScripts); + } } } return new ArrayList<String>(scripts); @@ -278,9 +301,11 @@ // create list of available scripts by excluding inherited scripts List<String> scripts = new ArrayList<String>(); - for (String script : settings.pushScripts) { - if (!inherited.contains(script)) { - scripts.add(script); + if (!ArrayUtils.isEmpty(settings.pushScripts)) { + for (String script : settings.pushScripts) { + if (!inherited.contains(script)) { + scripts.add(script); + } } } return scripts; @@ -489,7 +514,7 @@ } return teamnames; } - + public TeamModel getTeamModel(String name) { for (TeamModel team : allTeams) { if (team.name.equalsIgnoreCase(name)) { -- Gitblit v1.9.1