effective_datatables 4.3.7 → 4.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4642aa5881ff3eb183f287db8c42b61c5ec18a3d
-  data.tar.gz: ac20c253b356faf06abba201e3f705b81d64e5e4
+  metadata.gz: 42a1366723d6c700c2b5fb7c7fd613601182216b
+  data.tar.gz: 2781167994252173acbb561c09a0cf9f437b52a8
 SHA512:
-  metadata.gz: 309b3348a5507dd365dd6349b472301c29ca39ffd1cf77e516d031ed7a4c0c7a52b6fffe3cece2e59525acd1e412956cb26f645d13994287a2c898f7416fd573
-  data.tar.gz: 4b79372f60d9a26baeae025a63a84f2318d600adacc73b48525a463f21a6cc7b44bb7f066fdf53b6da7c11e36ee4ea8899a9458fcc407b966465a454d474d585
+  metadata.gz: ebd8eb10dd82fd0bd5db5642a5b8b74dc0e75f5f839d800b2ed9f76c9578d80475a6716627f90cffe80ffd6ce3204ce32e0a3853e0a802396fa5e2547bf6a410
+  data.tar.gz: bb2baf349bc5722e809f1b11cfe0424e758c775ccde053ed39f8f20af6865f7b3030cc9171c42a5ccb8956e2531b6276793d3a0a80c67c7d3915875b2cc68542

data/README.md

@@ -195,11 +195,11 @@ class PostsDatatable < Effective::Datatable
     col :post_category, action: :edit
 
     if attributes[:user_id].nil?  # Show all users, otherwise this table is meant for one user only
-      col :user, search: { collection: User.authors }
-
-      col 'user.first_name'  # Using the joined syntax
+      col :user, search: User.authors.all
     end
 
+    col 'user.first_name'  # Using the joined syntax
+
     if can?(:index, Comment)
       col :comments
     end
@@ -238,9 +238,11 @@ class PostsDatatable < Effective::Datatable
     # Puts links to show/edit/destroy actions, if authorized to those actions.
     # Use the actions_col block to add additional actions
 
-    actions_col(edit: false) do |post|
-      dropdown_link_to('Approve', approve_post_path(post) data: { method: :post, confirm: "Approve #{post}?"})
-    end
+    actions_col
+
+    # actions_col(edit: false) do |post|
+    #   dropdown_link_to('Approve', approve_post_path(post) data: { method: :post, confirm: "Approve #{post}?"})
+    # end
   end
 
 end
@@ -434,7 +436,9 @@ responsive: 10000          # Controls how columns collapse https://datatables.ne
 search: false
 search: :string
 search: { as: :string, fuzzy: true }
-search: { as: :select, collection: User.all, multiple: true }
+search: User.all
+search: { as: :select, collection: User.all, multiple: true, include_null: 'All Users' }
+search: { collection: { 'All Books' => Book.all, 'All Shirts' => Shirt.all}, polymorphic: true }
 
 sort: true|false           # Should this column be orderable. true by default
 sql_column: 'posts.rating' # The sql column to search/sort on. Only needed when doing custom selects or tricky joins.
@@ -447,7 +451,7 @@ It is auto-detected from an ActiveRecord collection's SQL datatype, and set to `
 
 Valid options for `:as` are as follows:
 
-`:boolean`, `:currency`, `:datetime`, `:date`, `:decimal`, `:duration`, `:email`, `:float`, `:integer`, `:percentage`, `:price`, `:resource`, `:string`, `:text`
+`:boolean`, `:currency`, `:datetime`, `:date`, `:decimal`, `:duration`, `:email`, `:float`, `:integer`, `:percent`, `:price`, `:resource`, `:string`, `:text`
 
 These settings are loosely based on the regular datatypes, with some custom effective types thrown in:
 
@@ -521,6 +525,7 @@ The authorization method is configured via the `config/initializers/effective_da
 There are just a few options:
 
 ```ruby
+btn_class: 'btn-sm btn-outline-primary'
 show: true|false
 edit: true|false
 destroy: true|false
@@ -697,10 +702,10 @@ end
 The filter command has the following options:
 
 ```ruby
-as: :select|:date|:boolean      # Passed to SimpleForm
+as: :select|:date|:boolean      # Passed to form
 label: 'My label'               # Label for this form field
 parse: -> { |term| term.to_i }  # Parse the incoming term (string) into whatever datatype
-required: true|false            # Passed to SimpleForm
+required: true|false            # Passed to form
 ```
 
 Any other option given will be yielded to SimpleForm as `input_html` options.
@@ -757,8 +762,6 @@ or if using [effective_resources](https://github.com/code-and-effect/effective_r
 
 ```ruby
 include Effective::CrudController
-
-collection_action :bulk_approve
 ```
 
 and in your model

data/app/helpers/effective_datatables_helper.rb

@@ -3,6 +3,7 @@ module EffectiveDatatablesHelper
 
   def render_datatable(datatable, input_js: {}, buttons: true, charts: true, entries: true, filters: true, inline: false, pagination: true, search: true, simple: false, sort: true)
     raise 'expected datatable to be present' unless datatable
+    raise 'expected input_js to be a Hash' unless input_js.kind_of?(Hash)
 
     if simple
       buttons = charts = entries = filters = pagination = search = sort = false
@@ -48,7 +49,7 @@ module EffectiveDatatablesHelper
         'display-records' => datatable.to_json[:recordsFiltered],
         'display-start' => datatable.display_start,
         'inline' => inline.to_s,
-        'options' => (input_js || {}).to_json.html_safe,
+        'options' => input_js.to_json,
         'reset' => (datatable_reset(datatable) if search),
         'reorder' => datatable_reorder(datatable),
         'reorder-index' => (datatable.columns[:_reorder][:index] if datatable.reorder?).to_s,

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.3.7'.freeze
+  VERSION = '4.3.8'.freeze
 end

metadata

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