Merge pull request #117 from AtlasOfLivingAustralia/bug/issue-116

issue #116 replacing usage of deprecated jsonp with json to prevent C…
AtlasOfLivingAustralia · Nov 2, 2022 · 458ac38 · 458ac38
2 parents 55d33bf + 030174f
commit 458ac38
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/grails-app/assets/javascripts/taxonTree.js b/grails-app/assets/javascripts/taxonTree.js
@@ -62,7 +62,7 @@ function initTaxonTree(treeOptions) {
                 ajax: {
                     url: function(node) {
                         var rank = $(node).attr("rank");
-                        var u = urlConcat(treeOptions.biocacheServicesUrl, "/breakdown.json?q=") + query + "&rank=";
+                        var u = urlConcat(treeOptions.biocacheServicesUrl, "/breakdown?q=") + query + "&rank=";
                         if (rank == 'kingdoms') {
                             u += 'kingdom';  // starting node
                         }
@@ -71,7 +71,7 @@ function initTaxonTree(treeOptions) {
                         }
                         return u;
                     },
-                    dataType: 'jsonp',
+                    dataType: 'json',
                     success: function(data) {
                         var nodes = [];
                         var rank = data.rank;

diff --git a/src/main/groovy/au/org/ala/dashboard/Constants.groovy b/src/main/groovy/au/org/ala/dashboard/Constants.groovy
@@ -21,15 +21,15 @@ class Constants {
 
         final static String PARTIAL_URL_VOLUNTEER_STATS = "/ws/stats.json"
 
-        final static String PARTIAL_URL_SPECIES_BY_DECADE = "/explore/groups.json?q=*:*&pageSize=10&fq=occurrence_year:"
+        final static String PARTIAL_URL_SPECIES_BY_DECADE = "/explore/groups?q=*:*&pageSize=10&fq=occurrence_year:"
 
         final static String PARTIAL_URL_INSTITUTION_COUNT = "/ws/institution/count"
 
         final static String PARTIAL_URL_COLLECTION_COUNT = "/ws/collection/count"
 
         final static String PARTIAL_URL_COUNT_DATASETS_BY_TYPE = "/ws/dataResource/count/resourceType?public=true"
 
-        final static String PARTIAL_URL_SPECIES_BY_CONSERVATION_STATUS= "/explore/groups.json?pageSize=10&q=state_conservation:"
+        final static String PARTIAL_URL_SPECIES_BY_CONSERVATION_STATUS= "/explore/groups?pageSize=10&q=state_conservation:"
 
         final static String PARTIAL_URL_LOGGER_TOTALS = "/service/totalsByType"