Passing parameters to download button

SpeciesFileGroup · Jan 20, 2017 · 66ff44f · 66ff44f
1 parent 2396fd1
commit 66ff44f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/app/assets/javascripts/views/tasks/collection_objects/area_and_date/index.js b/app/assets/javascripts/views/tasks/collection_objects/area_and_date/index.js
@@ -118,16 +118,15 @@ _init_map_table = function init_map_table() {
 
       $("#download_button").click(function (event) {
         if(validateMaxResults(1000)) {
-          //ajaxRequest(event, "download");
+          downloadForm(event);
         }
         else {
           $("body").append('<div class="alert alert-error"><div class="message">To Download- refine result to less than 1000 records</div><div class="alert-close"></div></div>');          
           return false;
         }
-      });      
+      });    
 
-      function ajaxRequest(event, href) {
-        if(validateDates() && validateDateRange()) {   
+      function serializeFields() {
           var data = '';
           var params = [];
 
@@ -143,10 +142,24 @@ _init_map_table = function init_map_table() {
             params.push($("#set_otu_form").serialize());
           }
 
-          data = params.join("&");
+          return data = params.join("&");
+      }
+
+      function downloadForm(event) {
+        event.preventDefault;
+        if(validateMaxResults(1000)) {
+          $('#download_form').attr('action', "download?" + serializeFields()).submit();
+        }
+        else {
+          $("body").append('<div class="alert alert-error"><div class="message">To Download- refine result to less than 1000 records</div><div class="alert-close"></div></div>');          
+          return false;
+        }
+      }        
 
+      function ajaxRequest(event, href) {
+        if(validateDates() && validateDateRange()) {   
           $("#find_item").mx_spinner('show');
-          $.get(href, data, function (local_data) {
+          $.get(href, serializeFields(), function (local_data) {
             // $("#find_item").mx_spinner('hide');  # this has been relocated to .../find.js.erb
           });//, 'json'  // I expect a json response
           $("#download_button").removeAttr("disabled");

diff --git a/app/views/tasks/collection_objects/filter/find.js.erb b/app/views/tasks/collection_objects/filter/find.js.erb
@@ -1,5 +1,6 @@
 // j is an alias for escape_javascript
 var html;
+$("#find_item").mx_spinner('show');
 html = $('<%= j(render(partial: 'result_list',
                        locals:  {collection_objects: @collection_objects})) %>');
 $("#show_list").html(html);