effective_datatables 2.11.2 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89fe9d65ab41811c5fe6f99d2a30178cdd17558e
-  data.tar.gz: 3778600b8979aeb4ec2553e00aef1dbd9d856e58
+  metadata.gz: 672de368787ac30eb2d42e8bfcde9cba24a61e98
+  data.tar.gz: fe3cb8fd151b68c9da65fd9f81fb949fa86caead
 SHA512:
-  metadata.gz: d25d50f56c92c86e72c812ff0d58ba59658cbe5856ff42965d5988406c7bca194e36114e6ad0958a135bd1447d7b3ed63bd6f2db7d2562eed02ae596662c0c1e
-  data.tar.gz: e5cf61f381816ab5946f7e5f689f644c522e9181d05940a73535018aae9ea5cc6b21394a8e7976921b53d4fde2a708d2b6458adcee37c59ac4ba775c0af09885
+  metadata.gz: bdffcce1d831eb5d0e27a5242257647a717d043ee64799d264b3bbdd31b6b460c70a05b9ad14294fa981bfd9dd78c44310e1cf153428e25dc943656d2bfb945e
+  data.tar.gz: b831ffff4efc8d3b154e4d93747d155d90037b874293ffb786d3c2daaf8fcc4ed750ef59ff11da74dddc3ea2757d3af35c71b013210b035825b5942db91bde33

data/README.md

@@ -501,7 +501,7 @@ datatable do
   bulk_actions_column do
     bulk_action 'Approve all', bulk_approve_posts_path, data: {confirm: 'Approve all selected posts?'}
     bulk_action_divider
-    bulk_action 'Send emails', bulk_email_posts_path, data : {confirm: 'Really send emails?'}
+    bulk_action 'Send emails', bulk_email_posts_path, data: {confirm: 'Really send emails?'}
   end
 
   ...

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

@@ -1,3 +1,9 @@
-$(document).on 'click', 'a[data-reset-form]', (event) ->
+$(document).on 'click', 'a[data-clear-form]', (event) ->
   event.preventDefault()
-  $(event.currentTarget).closest('form').trigger('reset')
+  $(event.currentTarget).closest('form').trigger('clear')
+
+$(document).on 'clear', '.effective-datatable-scopes form', (event) ->
+  $(this).find('.radio.active').removeClass('active');
+  $(this).find(':radio').prop('checked', false);
+  $('form.form-inline input:not([type=submit])').val('');
+  $(this).submit()

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

@@ -49,7 +49,6 @@ table.dataTable.sort-hidden thead .sorting_desc { background-image: none; }
 
 // Filter bar
 table.dataTable .form-group { width: 100%; margin-left: 0px; margin-right: 0px; }
-table.dataTable input { width: 100%; }
 table.dataTable select { width: 100%; }
 table.dataTable .form-control { width: 100%;  }
 table.dataTable .form-group.datatable_filter_bulk_actions { margin-left: 4px; }

data/app/helpers/effective_datatables_helper.rb

@@ -7,8 +7,8 @@ module EffectiveDatatablesHelper
     datatable.view ||= self
 
     begin
-      EffectiveDatatables.authorized?(controller, :index, datatable.collection_class) || raise('unauthorized')
-    rescue => e
+      EffectiveDatatables.authorized?(controller, :index, datatable.collection_class) || raise(Effective::AccessDenied)
+    rescue Effective::AccessDenied => e
       return content_tag(:p, "You are not authorized to view this datatable. (cannot :index, #{datatable.collection_class})")
     end
 
@@ -23,8 +23,8 @@ module EffectiveDatatablesHelper
     datatable.simple = true
 
     begin
-      EffectiveDatatables.authorized?(controller, :index, datatable.collection_class) || raise('unauthorized')
-    rescue => e
+      EffectiveDatatables.authorized?(controller, :index, datatable.collection_class) || raise(Effective::AccessDenied)
+    rescue Effective::AccessDenied => e
       return content_tag(:p, "You are not authorized to view this datatable. (cannot :index, #{datatable.collection_class})})")
     end
 

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

@@ -16,6 +16,6 @@
         - else
           = form.input name, options[:filter]
 
-      = form.submit 'Submit', class: 'btn btn-primary', 'data-disable-with' => 'Submitting...'
-      = link_to 'Reset', '#', 'data-reset-form' => true
-
+      .btn-group
+        = form.submit 'Filter', class: 'btn btn-primary', 'data-disable-with' => 'Submitting...'
+        = link_to 'Clear', '#', class: 'btn btn-default', 'data-clear-form' => true

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.11.2'.freeze
+  VERSION = '2.12.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.11.2
+  version: 2.12.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails