fixed FireFox event.preventDefault() refresh bug

mindovermiles262 · Nov 19, 2017 · 0beeba9 · 0beeba9
1 parent cc62d5b
commit 0beeba9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/app/assets/javascripts/forms.js b/app/assets/javascripts/forms.js
@@ -1,13 +1,13 @@
 $( document ).on('turbolinks:load', function() {
   // Removes Sample fields from Projects Form
-  $('form').on('click', '.destroy_fields', function() {
+  $('form').on('click', '.destroy_fields', function(event) {
     $(this).prev('input[type=hidden]').val('1')
     $(this).closest('.fieldset').hide()
     event.preventDefault()
   })
 
   // Adds Test fields to Samples form
-  $('form').on('click', '.add_fields', function() {
+  $('form').on('click', '.add_fields', function(event) {
     time = new Date().getTime()
     regex = new RegExp($(this).data('id'), 'g')
     $(this).before($(this).data('fields').replace(regex, time))
@@ -22,19 +22,21 @@ $( document ).on('turbolinks:load', function() {
   })
 
   // Remove Table Rows from Batch
-  $('table').on('click', '.destroy_row', function() {
-    $('#available_tests_section').show()
+  $('table').on('click', '.destroy_row', function(event) {
+    $('#available_tests_section').show();
     var row = $(this).parents('tr:first');
-    $(this).prev('input[type=hidden]').val('nil')
-    $('#append_to_unbatched').append(row)
-    $(row).find('a').attr('class', 'add_test_to_batch')
-    $(row).find('i').attr("aria-hidden", "true")
-    $(row).find('i').attr("class", "fa fa-plus")
-    event.preventDefault()
+    $(this).prev('input[type=hidden]').val('nil');
+    $('#append_to_unbatched').append(row);
+    $(row).find('a').attr('class', 'add_test_to_batch');
+    $(row).find('i').attr("aria-hidden", "true");
+    $(row).find('i').attr("class", "fa fa-plus");
+    event.preventDefault();
+    console.log("return false")
+    return false;
   })
 
   // Add Table Rows to Batch
-  $('table').on('click', '#add_test', function() {
+  $('table').on('click', '#add_test', function(event) {
     var row = $(this).parents('tr:first');
     $('#append_to_batch').append(row)
     $(row).find('a').attr('class', 'destroy_row')

diff --git a/app/views/batches/edit.html.erb b/app/views/batches/edit.html.erb
@@ -2,7 +2,7 @@
 
 <div class="columns">
   <div class="column is-10 is-offset-1">
-    <%= form_for @batch do |batch| %>
+    <%= form_for @batch, remote: true do |batch| %>
       <table class="table is-striped is-fullwidth">
         <thead>
           <tr>
@@ -14,7 +14,7 @@
           </tr>
         </thead>
         <tbody id='append_to_batch'>
-          <%= batch.fields_for :tests, remote: true do |test| %>
+          <%= batch.fields_for :tests do |test| %>
             <tr>
               <td><%= test.object.sample.project.user.company %></td>
               <td><%= test.object.sample.project.description %></td>
@@ -39,11 +39,7 @@
                 <%= p.label :pipet_id, "Pipet", class: 'field-label' %>
               </div>
               <div class="select field-control">
-                <%= 
-                  p.select :pipet_id, options_for_select(@pipets, selected: @selected), 
-                  {include_blank: true}, 
-                  {} 
-                %>
+                <%= p.select :pipet_id, options_for_select(@pipets, selected: @selected) %>
               </div>
             <% end %>
           </div>

diff --git a/db/schema.rb b/db/schema.rb
@@ -70,7 +70,6 @@
     t.string "reference_method"
     t.integer "turn_around_time"
     t.integer "detection_limit"
-    t.integer "batch_id"
     t.string "unit"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false