effective_datatables 2.6.15 → 2.6.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d928965ede9ce8dfc004b6f2653cac420eee7c6
-  data.tar.gz: b1612ccf4823b60f283d4c7f885b4b1224774dd4
+  metadata.gz: f0db1b45edf40f52aa0419d0ade8b440b191bede
+  data.tar.gz: be8443850e6d0d9eaf1d6072782c212c7616eb76
 SHA512:
-  metadata.gz: 7f26405d6274b823095d11290b1573114ace9ba17b386f59658b31d6fc27b9025bd3b04a24e9360f9e44700bcaa739edcca138f6686ac0cd365947f17b7ecb83
-  data.tar.gz: 4b622c39357d491f66baac5e773b86e0cfb0bd9ca98f4e80e8632771d8ea96febc437bd749f0819d8765b92915d7a0e9029acf00c0f61f77123a90b54eea0709
+  metadata.gz: 3b84a7aef73fe0f4f58153e69bc5f1dffaea6dfc1d62689e6c4b9be1a564549caa12968d07a8331437c0eeeb20a6844242884d888d26f64dedf2d1302e51767c
+  data.tar.gz: cc7eafce76ae1659c13a9efc10862f5ab35f7068780ec8a11dee197c77d3f701a172e37a930fc14825245f05e23ae433e8de77c2e725ad55a39e33544bf7291b

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

@@ -161,6 +161,6 @@ table.dataTable tbody {
   }
 
   td.col-bulk_actions {
-    input[type='checkbox'] { margin-left: 3px; }
+    input[type='checkbox'] { margin-left: 1px; margin-right: 1px; }
   }
 }

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

@@ -0,0 +1,8 @@
+.effective-datatable-scopes {
+  .form-inline {
+    .form-control, input[type='submit'] {
+      margin-left: 8px;
+    }
+  }
+  margin-bottom: 12px;
+}

data/app/assets/stylesheets/effective_datatables.scss

@@ -5,3 +5,5 @@
 @import 'dataTables/responsive/responsive.bootstrap';
 
 @import 'effective_datatables/overrides';
+
+@import 'effective_datatables/scopes';

data/app/helpers/effective_datatables_controller_helper.rb

@@ -0,0 +1,11 @@
+# These are expected to be called by a developer.  They are part of the datatables DSL.
+module EffectiveDatatablesControllerHelper
+
+  def render_datatable_index(datatable)
+    raise 'expected Effective::Datatable' unless datatable.kind_of?(Effective::Datatable)
+
+    @datatable = datatable
+    render file: 'effective/datatables/index'
+  end
+
+end

data/app/models/effective/datatable.rb

@@ -23,7 +23,7 @@ module Effective
     def initialize(*args)
       if args.present? && args.first != nil
         raise "#{self.class.name}.new() can only be initialized with a Hash like arguments" unless args.first.kind_of?(Hash)
-        args.first.each { |k, v| self.attributes[k] = v }
+        args.first.each { |k, v| self.attributes[k] = v.presence }
       end
 
       if respond_to?(:initialize_scopes)  # There was at least one scope defined in the scopes do .. end block

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

@@ -31,9 +31,14 @@ module Effective
       # We want to make sure an input_html: { value: default } exists
       def _initialize_scope_options(scopes)
         (scopes || []).each do |name, options|
-          value = attributes.key?(name) ? attributes[name] : options[:default]
+          value = attributes.key?(name) ? attributes[name].presence : options[:default]
 
-          if (options[:fallback] || options[:presence]) && attributes[name].blank? && attributes[name] != false
+          if attributes.key?(name) == false
+            self.attributes[name] = options[:default]
+            value = options[:default]
+          end
+
+          if (options[:fallback] || options[:presence]) && attributes[name].blank?
             self.attributes[name] = options[:default]
             value = options[:default]
           end

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

@@ -1,5 +1,5 @@
 .row
-  .col-sm-12
+  .col-sm-12.effective-datatable-scopes
     = simple_form_for :scopes, url: request.path, method: :get, html: { class: 'form-inline' } do |form|
 
       - datatable.scopes.each do |name, options|

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

@@ -0,0 +1,2 @@
+= render_datatable_scopes(@datatable)
+= render_datatable(@datatable)

data/lib/effective_datatables/engine.rb

@@ -9,6 +9,8 @@ module EffectiveDatatables
       ActiveSupport.on_load :action_controller do
         helper EffectiveDatatablesHelper
         helper EffectiveDatatablesPrivateHelper
+
+        ActionController::Base.send :include, ::EffectiveDatatablesControllerHelper
       end
     end
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.6.15'.freeze
+  VERSION = '2.6.16'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.6.15
+  version: 2.6.16
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2016-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -133,7 +133,9 @@ files:
 - app/assets/stylesheets/dataTables/responsive/responsive.bootstrap.css
 - app/assets/stylesheets/effective_datatables.scss
 - app/assets/stylesheets/effective_datatables/_overrides.scss.erb
+- app/assets/stylesheets/effective_datatables/_scopes.scss
 - app/controllers/effective/datatables_controller.rb
+- app/helpers/effective_datatables_controller_helper.rb
 - app/helpers/effective_datatables_helper.rb
 - app/helpers/effective_datatables_private_helper.rb
 - app/models/effective/access_denied.rb
@@ -158,6 +160,7 @@ files:
 - app/views/effective/datatables/_datatable.html.haml
 - app/views/effective/datatables/_scopes.html.haml
 - app/views/effective/datatables/_spacer_template.html
+- app/views/effective/datatables/index.html.haml
 - config/routes.rb
 - lib/effective_datatables.rb
 - lib/effective_datatables/engine.rb