effective_datatables 4.3.9 → 4.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9b89f0b4d171f32ab9d0cec5bdbf9aed4dfc6d8
-  data.tar.gz: 072ae799d4ec109020421d1f90051801aec70225
+  metadata.gz: a2e79c3aee191317391bd99e89b942fcdbeab3d8
+  data.tar.gz: da4378c6d6ea2abe3b8599e6f7c265ecd3ff9740
 SHA512:
-  metadata.gz: 85b7cc85ed6373577c2d85b466986722588c9e9dc8515b612a077f111117f4169b385c8273fee057901db5510dfc92ad03a12cab882f3a88b02de8f51ff0e1ea
-  data.tar.gz: bbe868121e147e40912b5830988879f1a2291be4c687e4bbb07e59b412998a89f0c2d162be4dafb2292f07df79338ecbe2180b29736e028ec8f47bd61b063ebb
+  metadata.gz: 5578434dbcfaabd0afb207b0bc6ba1e45622da78dbe5848659367f039ddb9bb387505abbe0eeabfdc49c00d2565362d3afe532b81bf63ba856287c9f0bd206df
+  data.tar.gz: addf9df90187cbd2572568acbb34b0d4038075f3e894049ae2824074047a77f6da76130fe29f84e8639ee8b318da10a3b64191547566d2f5e7c62e15c21eeb5b

data/app/assets/javascripts/effective_datatables/inline_crud.js.coffee

@@ -35,6 +35,16 @@ $(document).on 'ajax:success', '.dataTables_wrapper .col-actions', (event) ->
   EffectiveForm.remote_form_flash = ''
   true
 
+# There was an error completing something
+$(document).on 'ajax:error', '.dataTables_wrapper', (event) ->
+  $action = $(event.target)
+  $table = $action.closest('table')
+  $table.DataTable().flash('Error: unable to ' + ($action.attr('title') || 'complete action')).draw()
+
+  EffectiveForm.remote_form_payload = ''
+  EffectiveForm.remote_form_flash = ''
+  true
+
 # The inline form has been submitted successfully
 $(document).on 'effective-form:success', '.dataTables_wrapper .col-inline-form', (event, flash) ->
   $action = $(event.target)
@@ -53,11 +63,7 @@ $(document).on 'effective-form:success', '.dataTables_wrapper .col-inline-form',
     $table.DataTable().flash(flash || 'Item updated').draw()
     $tr.fadeOut('slow')
 
-# There was an error completing something
-$(document).on 'ajax:error', '.dataTables_wrapper .col-inline-form', (event) ->
-  $action = $(event.target)
-  $table = $action.closest('table')
-  $table.DataTable().flash('Error: unable to ' + ($action.attr('title') || 'complete action')).draw()
+
 
 beforeNew = ($action) ->
   $table = $action.closest('table')

data/app/assets/javascripts/effective_datatables/reorder.js.coffee

@@ -33,5 +33,10 @@ $(document).on 'click', '.dataTables_wrapper a.buttons-reorder', (event) ->
   column = $table.DataTable().column('.col-_reorder')
   return unless column.length > 0
 
+  if column.visible()
+    $table.removeClass('reordering')
+  else
+    $table.addClass('reordering')
+
   column.visible(!column.visible())
 

data/app/assets/stylesheets/dataTables/responsive/responsive.bootstrap4.css

@@ -14,8 +14,8 @@ table.dataTable.dtr-inline.collapsed > tbody > tr[role="row"] > th:first-child {
   padding-left: 30px;
   cursor: pointer;
 }
-table.dataTable.dtr-inline.collapsed > tbody > tr[role="row"] > td:first-child:before,
-table.dataTable.dtr-inline.collapsed > tbody > tr[role="row"] > th:first-child:before {
+table.dataTable.dtr-inline.collapsed:not(.reordering) > tbody > tr[role="row"] > td:first-child:before,
+table.dataTable.dtr-inline.collapsed:not(.reordering) > tbody > tr[role="row"] > th:first-child:before {
   top: 12px;
   left: 4px;
   height: 14px;

data/app/helpers/effective_datatables_private_helper.rb

@@ -34,15 +34,15 @@ module EffectiveDatatablesPrivateHelper
   end
 
   def datatable_reorder(datatable)
-    return false unless datatable.reorder? && EffectiveDatatables.authorized?(self, :update, datatable.collection_class)
+    return unless datatable.reorder? && EffectiveDatatables.authorized?(self, :update, datatable.collection_class)
     link_to(content_tag(:span, 'Reorder'), '#', class: 'btn btn-link btn-sm buttons-reorder', disabled: true)
   end
 
   def datatable_new_resource_button(datatable, name, column)
-    if column[:inline] && column[:actions][:new] != false
-      actions = {'New' => { action: :new, class: ['btn', column[:btn_class].presence].compact.join(' '), 'data-remote': true } }
-      render_resource_actions(datatable.resource.klass, actions: actions, effective_resource: datatable.resource) # Will only work if permitted
-    end
+    return unless column[:inline] && (column[:actions][:new] != false) && (datatable.resource.actions.include?(:new) rescue false)
+
+    actions = {'New' => { action: :new, class: ['btn', column[:btn_class].presence].compact.join(' '), 'data-remote': true } }
+    render_resource_actions(datatable.resource.klass, actions: actions, effective_resource: datatable.resource) # Will only work if permitted
   end
 
   def datatable_label_tag(datatable, name, opts)

data/app/models/effective/effective_datatable/cookie.rb

@@ -71,7 +71,7 @@ module Effective
         )
 
         # Just store the values
-        [attributes.delete_if { |k, v| v.nil? }] + payload.values
+        [attributes] + payload.values
       end
 
     end

data/app/models/effective/effective_datatable/resource.rb

@@ -8,7 +8,7 @@ module Effective
       end
 
       def controller_namespace
-        @attributes[:_n]
+        @attributes.key?(:namespace) ? @attributes[:namespace] : @attributes[:_n]
       end
 
       private

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.3.9'.freeze
+  VERSION = '4.3.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.3.9
+  version: 4.3.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2018-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails