Fixed AtlasOfLivingAustralia/alerts/issues/46

Alerts fq params were being ignored - they were not urlEncoded it turns out, so "&fq=" got read as a new request param by alerts instead of being encapsulated inside the webserviceQuery param.
AtlasOfLivingAustralia · Feb 1, 2019 · 03b916b · 03b916b
1 parent 8c42a0e
commit 03b916b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/grails-app/assets/javascripts/search.js b/grails-app/assets/javascripts/search.js
@@ -551,13 +551,14 @@ $(document).ready(function() {
         }
         var methodName = $(this).data("method");
         var url = alertsUrlPrefix + "/ws/" + methodName + "?";
+        var searchParamsEncoded = encodeURIComponent(decodeURIComponent(BC_CONF.searchString)); // prevent double encoding of chars
         url += "queryDisplayName="+encodeURIComponent(query);
         url += "&baseUrlForWS=" + encodeURIComponent(BC_CONF.biocacheServiceUrl.replace(/\/ws$/,""));
         url += "&baseUrlForUI=" + encodeURIComponent(BC_CONF.serverName);
-        url += "&webserviceQuery=%2Fws%2Foccurrences%2Fsearch" + BC_CONF.searchString;
-        url += "&uiQuery=%2Foccurrences%2Fsearch%3Fq%3D*%3A*";
+        url += "&webserviceQuery=%2Fws%2Foccurrences%2Fsearch" + searchParamsEncoded;
+        url += "&uiQuery=%2Foccurrences%2Fsearch" + searchParamsEncoded;
         url += "&resourceName=" + encodeURIComponent(BC_CONF.resourceName);
-        //console.log("url", query, methodName, url);
+        //console.log("url", query, methodName, searchParamsEncoded, url);
         window.location.href = url;
     });