From bad5b895e08ffb7faaf94a3f2c2dcbb0f6ce75c4 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Wed, 13 Mar 2019 16:09:46 +0000
Subject: [PATCH] implemented check on numbner of batches and the bug found

git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/branches/portlets/user/PerformFISH-Apps/1.3@178573 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../html/farmrepository/view_farm_repository.jsp      | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/html/farmrepository/view_farm_repository.jsp b/src/main/webapp/html/farmrepository/view_farm_repository.jsp
index dddf208..4acba56 100644
--- a/src/main/webapp/html/farmrepository/view_farm_repository.jsp
+++ b/src/main/webapp/html/farmrepository/view_farm_repository.jsp
@@ -30,7 +30,7 @@ function closeAndReload() {
 }
 
 $(function () {
-	checkBatchesThreshold = function (theButton, endpoint, farmId, batchType) {
+	checkBatchesThreshold = function (theButton, endpoint, farmId, batchType, farmIdEncoded, batchTypeEncoded) {
         $(theButton).html('<i class="icon-cog"> checking batches, please wait ...');
         $.ajax({
     		url : endpoint,
@@ -45,7 +45,7 @@ $(function () {
     		success : function(data) {
     			var content = JSON.parse(data);
     			if (content.success == "OK") {
-    				location.href='${AnalyticalToolkitPortletEndpoint}?${batchTypeParamEncoded}=${batchTypeEncoded}&${farmIdParamEncoded}=${farmIdEncoded}';
+    				location.href='${AnalyticalToolkitPortletEndpoint}?${batchTypeParamEncoded}='+batchTypeEncoded+'&${farmIdParamEncoded}='+farmIdEncoded;
     			}
     			else {
     				 $(theButton).html('<i class="icon-warning-sign">' + content.message);
@@ -176,13 +176,10 @@ $(function () {
 											<c:otherwise>
 												<div style="display: inline;">
 													<button  class="btn" type="button" 
-													onClick="checkBatchesThreshold(this, '${checkBatchesThresholdURL}', '${farmId}', '${form.batchType}')">
+													onClick="checkBatchesThreshold(this, '${checkBatchesThresholdURL}', '${farmId}', '${form.batchType}', '${farmIdEncoded}', '${batchTypeEncoded}')">
 													Analyse
 													</button>
-												</div>
-											<%-- 										<button class="btn" type="button" ${buttonDisabled} --%>
-	<%-- 										onClick="">Analyse </button> --%>
-										
+												</div>								
 											</c:otherwise>
 										</c:choose>					
 									</c:if>