From f67ca73e6b960881fa0097651d18b29227d193dc Mon Sep 17 00:00:00 2001
From: Eugene Petrenko <eugene.petrenko@gmail.com>
Date: Wed, 17 Aug 2011 02:10:01 +0400
Subject: [PATCH] support custom nuget.exe selection

---
 .../resources/tool/runnerSettings.jsp         | 54 +++++++++++++++++--
 .../ui/ToolSelectorController.java            |  9 ++--
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/nuget-server/resources/tool/runnerSettings.jsp b/nuget-server/resources/tool/runnerSettings.jsp
index 6d37cdf..bca8997 100644
--- a/nuget-server/resources/tool/runnerSettings.jsp
+++ b/nuget-server/resources/tool/runnerSettings.jsp
@@ -22,23 +22,69 @@
 <jsp:useBean id="clazz" scope="request" type="java.lang.String"/>
 <jsp:useBean id="style" scope="request" type="java.lang.String"/>
 <jsp:useBean id="value" scope="request" type="java.lang.String"/>
+<jsp:useBean id="customValue" scope="request" type="java.lang.String"/>
 <jsp:useBean id="settingsUrl" scope="request" type="java.lang.String"/>
 <jsp:useBean id="items" scope="request" type="java.util.Collection<jetbrains.buildServer.nuget.server.toolRegistry.ui.ToolInfo >"/>
 
-<props:selectProperty name="${name}" className="${clazz}" style="${style}">
+<props:hiddenProperty name="${name}" value="${value}"/>
+
+<props:selectProperty name="nugetPathSelector" className="${clazz}" style="${style}" onchange="BS.NuGet.RunnerSettings.selectionChanged();">
   <c:set var="isSelected" value="${value eq ''}"/>
   <props:option value="" selected="${isSelected}">-- Select NuGet version to run --</props:option>
+
   <c:set var="hasSelected" value="${isSelected}"/>
   <c:forEach var="it" items="${items}">
     <c:set var="isSelected" value="${it.id eq value}"/>
     <props:option value="${it.id}" selected="${isSelected}"><c:out value="${it.version}"/></props:option>
     <c:if test="${isSelected}"><c:set var="hasSelected" value="${true}"/></c:if>
   </c:forEach>
-  <c:if test="${not hasSelected}">
-    <props:option value="${value}" selected="${true}">Custom: <c:out value="${value}"/></props:option>
-  </c:if>
+  <props:option value="custom" selected="${not hasSelected}">Custom</props:option>
 </props:selectProperty>
 <span class="smallNote">Specify NuGet.exe version.
   Check intalled NuGet Commandline tools in <a href="<c:url value="${settingsUrl}"/>">NuGet Settings</a>
 </span>
+
+<div id="customPathContainer">
+  <props:textProperty name="nugetCustomPath" className="${clazz}" style="${style}" onchange="BS.NuGet.RunnerSettings.customPathChanged();"/>
+  <span class="smallNote">Specify custom path to NuGet.exe</span>
+</div>
 <span class="error" id="error_${name}"></span>
+
+<script type="text/javascript">
+  if (!BS) BS = {};
+  if (!BS.NuGet) BS.NuGet = {};
+  BS.NuGet.RunnerSettings = {
+    isPackage : function(x) {
+      return x.length > 0 && x.charAt(0) == '?';
+    },
+
+    setValue : function(x) {
+      $('${name}').value = x;
+    },
+
+    getValue : function() {
+      return $('${name}').value;
+    },
+
+    selectionChanged : function() {
+      var selected = $('nugetPathSelector').value;
+      if (this.isPackage(selected)) {
+        this.setValue(selected);
+        BS.Util.hide($('customPathContainer'));
+      } else if(selected == "custom") {
+        var val = this.getValue();
+        $('nugetCustomPath').value = this.isPackage(val) ? "<bs:forJs>${customValue}</bs:forJs>" : val;
+        this.customPathChanged();
+        BS.Util.show($('customPathContainer'));
+      } else {
+        this.setValue("");
+      }
+      BS.MultilineProperties.updateVisible();
+    },
+    customPathChanged : function() {
+      $('${name}').value = $('nugetCustomPath').value;
+    }
+  };
+
+  BS.NuGet.RunnerSettings.selectionChanged();
+</script>
diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/ui/ToolSelectorController.java b/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/ui/ToolSelectorController.java
index 3627b16..def62d1 100644
--- a/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/ui/ToolSelectorController.java
+++ b/nuget-server/src/jetbrains/buildServer/nuget/server/toolRegistry/ui/ToolSelectorController.java
@@ -59,7 +59,7 @@ public class ToolSelectorController extends BaseController {
   @Override
   protected ModelAndView doHandle(HttpServletRequest request, HttpServletResponse response) throws Exception {
     final String name = safe(request.getParameter("name"));
-    String value = parseValue(request, name);
+    String value = parseValue(request, "value", name);
     final Collection<ToolInfo> tools = getTools();
     ensureVersion(value, tools);
 
@@ -67,6 +67,7 @@ public class ToolSelectorController extends BaseController {
     ModelAndView mv = new ModelAndView(myDescriptor.getPluginResourcesPath("tool/runnerSettings.jsp"));
     mv.getModel().put("name", name);
     mv.getModel().put("value", value);
+    mv.getModel().put("customValue", safe(parseValue(request, "customValue", "nugetCustomPath")));
     mv.getModel().put("clazz", safe(request.getParameter("class")));
     mv.getModel().put("style", safe(request.getParameter("style")));
     mv.getModel().put("items", tools);
@@ -97,15 +98,15 @@ public class ToolSelectorController extends BaseController {
   }
 
   @NotNull
-  private String parseValue(HttpServletRequest request, String name) {
+  private String parseValue(HttpServletRequest request, final String requestName, String propertyName) {
     String value = null;
 
     final BasePropertiesBean bean = (BasePropertiesBean)request.getAttribute("propertiesBean");
     if (bean != null) {
-      value = bean.getProperties().get(name);
+      value = bean.getProperties().get(propertyName);
     }
     if (value == null) {
-      value = request.getParameter("value");
+      value = request.getParameter(requestName);
     }
     if (value == null) {
       value = "";
-- 
2.23.3