~ limitations under the License.\r
--%>\r
<%@ include file="/include-internal.jsp" %>\r
-<%@ taglib prefix="props" tagdir="/WEB-INF/tags/props" %>\r
<jsp:useBean id="available"\r
type="java.util.Collection<jetbrains.buildServer.nuget.server.toolRegistry.NuGetTool>"\r
scope="request"/>\r
<tr>\r
<th><label for="toolId">Version:<l:star/></label></th>\r
<td>\r
- <props:selectProperty name="toolId" style="width:15em;">\r
- <props:option value="">-- Please choose version --</props:option>\r
+ <input type="hidden" name="whatToDo" value="install" />\r
+ <forms:select name="toolId" style="width:15em;">\r
+ <forms:option value="">-- Please choose version --</forms:option>\r
<c:forEach var="t" items="${available}">\r
<forms:option value="${t.id}"><c:out value="${t.version}"/></forms:option>\r
</c:forEach>\r
- </props:selectProperty>\r
+ </forms:select>\r
<span class="smallNote">\r
Choose version of NuGet Commandline Tools to install.\r
</span>\r
if (!BS.NuGet) BS.NuGet = {};\r
\r
BS.NuGet.Tools = {\r
+ installUrl : '',\r
+\r
refreshPackagesList : function() {\r
$('nugetPackagesList').refresh();\r
},\r
\r
+ removeTool : function(toolId) {\r
+ BS.ajaxRequest(this.installUrl, {\r
+ parameters : {\r
+ whatToDo : "remove",\r
+ toolId : toolId\r
+ },\r
+\r
+ onComplete: function() {\r
+ BS.NuGet.Tools.refreshPackagesList();\r
+ }\r
+ })\r
+ },\r
+\r
InstallPopup : OO.extend(BS.PluginPropertiesForm, OO.extend(BS.AbstractModalDialog, {\r
getContainer : function() {\r
return $('nugetInstallFormDialog');\r
<td>\r
<c:choose>\r
<c:when test="${tool.state.installed}">\r
- <a href="#">Remove</a>\r
+ <a href="#" onclick="BS.NuGet.Tools.removeTool('<bs:forJs>${tool.id}</bs:forJs>');">Remove</a>\r
</c:when>\r
<c:when test="${tool.state.installing}">\r
<bs:commentIcon text="Messages"/>\r
</bs:modalDialog>\r
\r
<script type="text/javascript">\r
+ BS.NuGet.Tools.installUrl = "<bs:forJs>${actualInstallerUrl}</bs:forJs>";\r
BS.NuGet.Tools.InstallPopup.disableSubmit();\r
</script>\r
import java.lang.reflect.Proxy;\r
import java.util.Arrays;\r
import java.util.Collection;\r
+import java.util.Collections;\r
import java.util.List;\r
\r
/**\r
\r
@NotNull\r
public Collection<NuGetInstallingTool> getInstallingTool() {\r
- return mockInstallingTools();\r
+ return Collections.emptyList();\r
}\r
\r
@NotNull\r
\r
@Override\r
protected void doPost(HttpServletRequest request, HttpServletResponse response, Element xmlResponse) {\r
- final String toolId = request.getParameter("prop:toolId");\r
+ String toolId = request.getParameter("toolId");\r
if (StringUtil.isEmptyOrSpaces(toolId)) {\r
ActionErrors ae = new ActionErrors();\r
ae.addError("toolId", "Select NuGet.Commandline package version to install");\r
return;\r
}\r
\r
- myToolsManager.installTool(toolId);\r
+ final String whatToDo = request.getParameter("whatToDo");\r
+ if ("install".equals(whatToDo)) {\r
+ myToolsManager.installTool(toolId);\r
+ return;\r
+ }\r
+\r
+ if ("remove".equals(whatToDo)) {\r
+ myToolsManager.removeTool(toolId);\r
+ }\r
}\r
}\r