From 18be1a5b705ef36b60841f7cce2eb6f2916af02c Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 13 Aug 2012 08:13:02 +0200 Subject: [PATCH] do not transform script resources --- .../sonia/scm/template/TemplateServlet.java | 19 +------------------ scm-webapp/src/main/webapp/index.mustache | 2 +- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java b/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java index 743ebd3557..6f083fdf38 100644 --- a/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java +++ b/scm-webapp/src/main/java/sonia/scm/template/TemplateServlet.java @@ -35,9 +35,7 @@ package sonia.scm.template; //~--- non-JDK imports -------------------------------------------------------- -import com.google.common.base.Function; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -45,7 +43,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import sonia.scm.SCMContextProvider; -import sonia.scm.resources.Resource; import sonia.scm.resources.ResourceManager; import sonia.scm.resources.ResourceType; import sonia.scm.util.IOUtil; @@ -56,7 +53,6 @@ import java.io.IOException; import java.io.Writer; import java.util.HashMap; -import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Set; @@ -137,20 +133,7 @@ public class TemplateServlet extends HttpServlet params.put("contextPath", contextPath); params.put("version", version); - List scrips = - Lists.transform(resourceManager.getResources(ResourceType.SCRIPT), - new Function() - { - - @Override - public String apply(Resource f) - { - return f.getName(); - } - - }); - - params.put("scripts", scrips); + params.put("scripts", resourceManager.getResources(ResourceType.SCRIPT)); Locale l = request.getLocale(); diff --git a/scm-webapp/src/main/webapp/index.mustache b/scm-webapp/src/main/webapp/index.mustache index e8f4839437..b069ef9b62 100644 --- a/scm-webapp/src/main/webapp/index.mustache +++ b/scm-webapp/src/main/webapp/index.mustache @@ -159,7 +159,7 @@ {{#scripts}} - + {{/scripts}} {{#nonDefaultLocale}}