effective_datatables 4.3.12 → 4.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29a6e0d0478885ad23309fecf7867b03dca64adf
-  data.tar.gz: 0b61e07209624deada4c8d3eaf250582cbb2c2b4
+  metadata.gz: becca55d8f11979e333f3f0a40e587d79e2280d7
+  data.tar.gz: ad7d4200759f221445c283c4b0afdca9166165bf
 SHA512:
-  metadata.gz: 487154867732b2b954e9f1966246b6d9e32d919cc885ec8f98771bf020f58a1c8ed85177214442187357b1b464fa8063affffe6b9ba2f18a983e9d54022d98b3
-  data.tar.gz: 5fba36836e3c439dfa736e67fa9bb84ef4ef50c4b46880d9431effb321f1d7c9cb1052338e56b139926aa7558fe7b62ede4e2fc52f62def9f5e4b7a9e4dbbbf1
+  metadata.gz: e48ceae89e86dbb2fdf796c8547d4f650590e038be2ff868e853fb77227cafb728cec96ac125d90bd83b249a59dbafe4d05165399181b025f96b8443aa643d59
+  data.tar.gz: 5d7fb0d3447389f5d489eadea1ff51d8e838863669db23e5e595f07e406e8dce8a6154914ac09f48ad40983c8fd37a7add11473d7eb86d82d9ec944e65fdfd18

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

@@ -17,7 +17,7 @@ flash = (message, status = '') ->
   timeout = $processing.data('timeout')
   clearTimeout(timeout) if timeout
 
-  delay = (if status == 'danger' then 4000 else 1000)
+  delay = (if status == 'danger' then 4000 else 1500)
 
   $processing.html(message).data('timeout', setTimeout( =>
       $processing.html('Processing...').hide()

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

@@ -1,7 +1,7 @@
 # To achieve inline crud, we use rails' data-remote links, and override their behaviour when inside a datatable
 # This works with EffectiveForm.remote_form which is part of the effective_bootstrap gem.
 
-# About to do a resource action, or fetch a partial. Show loading.
+# We click the New/Edit/Action button from the col-actions
 $(document).on 'ajax:beforeSend', '.dataTables_wrapper .col-actions', (e, xhr, settings) ->
   $action = $(e.target)
   $table = $(e.target).closest('table')
@@ -12,7 +12,7 @@ $(document).on 'ajax:beforeSend', '.dataTables_wrapper .col-actions', (e, xhr, s
   settings.url += (if settings.url.indexOf('?') == -1 then '?' else '&') + $params
 
   if $action.closest('.effective-datatables-inline-row').length > 0
-    # Nothing. This is a save action from within the inline form.
+    # Nothing.
   else if $action.closest('tr').parent().prop('tagName') == 'THEAD'
     beforeNew($action)
   else
@@ -45,6 +45,15 @@ $(document).on 'ajax:error', '.dataTables_wrapper', (event) ->
   EffectiveForm.remote_form_flash = ''
   true
 
+# Submitting an inline datatables form
+$(document).on 'ajax:beforeSend', '.dataTables_wrapper .col-inline-form', (e, xhr, settings) ->
+  $table = $(e.target).closest('table')
+
+  $params =  $.param({_datatable_id: $table.attr('id'), _datatable_cookie: $table.data('cookie') })
+  settings.url += (if settings.url.indexOf('?') == -1 then '?' else '&') + $params
+
+  true
+
 # The inline form has been submitted successfully
 $(document).on 'effective-form:success', '.dataTables_wrapper .col-inline-form', (event, flash) ->
   $action = $(event.target)

data/app/assets/stylesheets/effective_datatables/_overrides.scss

@@ -128,16 +128,28 @@ table.dataTable.collapsed  {
 
 // Processing div
 div.dataTables_wrapper div.dataTables_processing {
+  margin: -26px 25% 0px 25%;
+
   position: absolute;
-  top: 1em;
-  left: 50%;
-  width: 300px;
-  margin-left: -150px;
-  margin-top: -26px;
+  top: 0;
+  left: 0;
+  width: 50%;
   text-align: center;
   padding: 1em;
 }
 
+// Processing success
+div.dataTables_wrapper div.dataTables_processing.alert-success {
+  margin: -26px 10% 0px 10%;
+  width: 80%;
+}
+
+// Processing error
+div.dataTables_wrapper div.dataTables_processing.alert-danger {
+  margin: -26px 10% 0px 10%;
+  width: 80%;
+}
+
 // Simple styles
 table.dataTable.hide-sort > thead {
   .sorting { background-image: none; cursor: default; }

data/app/models/effective/effective_datatable/dsl/datatable.rb

@@ -122,7 +122,7 @@ module Effective
 
         # Called automatically after bulk_actions do ... end
         # Call again if you want to change the position of the bulk_actions_col
-        def bulk_actions_col(col_class: nil, partial: nil, partial_as: nil, responsive: 5000)
+        def bulk_actions_col(col_class: nil, input_name: nil, partial: nil, partial_as: nil, responsive: 5000)
           datatable._columns.delete(:_bulk_actions) if datatable.columns[:_bulk_actions]
 
           datatable._columns[:_bulk_actions] = Effective::DatatableColumn.new(
@@ -132,6 +132,7 @@ module Effective
             col_class: col_class,
             format: nil,
             index: nil,
+            input_name: (input_name || 'bulk_actions_resources'),
             label: false,
             name: :bulk_actions,
             partial: partial || '/effective/datatables/bulk_actions_column',

data/app/views/effective/datatables/_bulk_actions_column.html.haml

@@ -2,5 +2,5 @@
 
 .form-group.custom-control.custom-checkbox
   %input{value: 0, type: 'hidden'}
-  %input.custom-control-input{name: 'bulk_actions_resources[]', id: "datatable_bulk_actions_resource_#{id}", value: id, type: 'checkbox', autocomplete: 'off', 'data-role': 'bulk-action' }
+  %input.custom-control-input{name: "#{column[:input_name]}[]", id: "datatable_bulk_actions_resource_#{id}", value: id, type: 'checkbox', autocomplete: 'off', 'data-role': 'bulk-action' }
   %label.custom-control-label{for: "datatable_bulk_actions_resource_#{id}" }

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.3.12'.freeze
+  VERSION = '4.3.13'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.3.12
+  version: 4.3.13
 platform: ruby
 authors:
 - Code and Effect