effective_datatables 3.2.4 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bff5ff06830aa75fddc8b3f258efb2bcf2172711
-  data.tar.gz: e8fb0ce5abfb5cda5f923e8129cbac8ffc66fdbe
+  metadata.gz: 5f740fcfa8103e4a41cd19d78627e660ed8261d7
+  data.tar.gz: 2a38dab4e9bfd6532d6455abdda04f50d928680b
 SHA512:
-  metadata.gz: 0f6fdd1eb126d275c1fd1d6b8f3cc94bb03bff1d46ccb61ae2f13b4c66fd159a859b306bc51d24897d579ecc155e9e85abaad18591a91380e374c5f40eea21c7
-  data.tar.gz: ff02255065aa756979a8389deec17c3a2e7f4778bae700fd21a8502eef4449795e98386836c68ef499a6e848dd8ad8f611fda3dbe43af80224a7d74a18250c2d
+  metadata.gz: 28352978829362e667d377d03864e7cde3b9f4ce72230bd61d3c68aa97ba0f29f8ef49697171da41d84931fee1b4beea6229dd9f232e7276b49d82914f3579db
+  data.tar.gz: 255b54c6a2763303e7b9d423fa74cc846fe7fa771bd4292a4681e9b2bb90e70d4e1819bb937d88d0132cb92723f30791dcafab4dba6017bcb449e2e7f556aa03

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

@@ -1,7 +0,0 @@
-.effective-datatable-filters {
-  .form-inline {
-    .form-group { margin-right: 10px; }
-    .control-label { margin-right: 10px; }
-  }
-  margin-bottom: 12px;
-}

data/app/models/effective/datatable_value_tool.rb

@@ -85,12 +85,12 @@ module Effective
 
       # term == 'nil' rescue false is a Rails 4.1 fix, where you can't compare a TimeWithZone to 'nil'
       if (term == 'nil' rescue false)
-        return collection.select! { |row| obj_to_value(row[index], column) == nil } || collection
+        return collection.select! { |row| obj_to_value(row[index], column, row) == nil } || collection
       end
 
       # See effective_resources gem search() method # relation.rb
       collection.select! do |row|
-        obj = obj_to_value(row[index], column)
+        obj = obj_to_value(row[index], column, row)
 
         case column[:as]
         when :boolean
@@ -165,8 +165,20 @@ module Effective
       collection.size
     end
 
-    def obj_to_value(obj, column)
-      ((column[:partial] || column[:format]) && !column[:compute]) ? obj.send(column[:name]) : obj
+    def obj_to_value(obj, column, row = nil)
+      return obj if column[:compute]
+
+      # This matches format.rb.  Probably should be refactored.
+
+      if column[:format]
+        datatable.dsl_tool.instance_exec(obj, row, &column[:format])
+      elsif column[:partial]
+        raise 'unsupported'
+      elsif obj.respond_to?(column[:name])
+        obj.send(column[:name])
+      else
+        obj
+      end
     end
 
   end

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

@@ -52,7 +52,7 @@ module Effective
       end
 
       def format_column(value, column)
-        return if value.nil?
+        return if value.nil? || (column[:resource] && value.blank?)
 
         unless column[:as] == :email
           return value if value.kind_of?(String)

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

@@ -19,6 +19,7 @@ module Effective
         if active_record_collection?
           columns.each do |name, opts|
 
+            # col 'comments.title'
             if name.kind_of?(String) && name.include?('.')
               raise "invalid datatables column '#{name}'. the joined syntax only supports one dot." if name.scan(/\./).count > 1
 
@@ -28,8 +29,10 @@ module Effective
                 raise "invalid datatables column '#{name}'. unable to find '#{name.split('.').first}' association on '#{resource}'."
               end
 
-              unless collection.joins_values.include?(associated) || collection.joins_values.include?(associated.to_sym)
-                raise "your datatables collection must .joins(:#{associated}) to work with the joined syntax"
+              joins_values = (collection.joins_values + collection.left_outer_joins_values)
+
+              unless joins_values.include?(associated.to_sym)
+                raise "your datatables collection must .joins(:#{associated}) or .left_outer_joins(:#{associated}) to work with the joined syntax"
               end
 
               opts[:resource] = Effective::Resource.new(resource.associated(associated), namespace: controller_namespace)

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

@@ -1,8 +1,8 @@
-.row
-  .col-sm-12.effective-datatable-filters{'aria-controls' => datatable.to_param}
-    = simple_form_for :filters, url: (datatable._form[:url] || '#'), method: datatable._form[:verb], html: { class: 'form-inline' } do |form|
+.effective-datatable-filters{'aria-controls': datatable.to_param}
+  = simple_form_for :filters, url: (datatable._form[:url] || '#'), method: datatable._form[:verb], html: { class: 'form-inline' } do |form|
 
-      - if datatable._scopes.present?
+    - if datatable._scopes.present?
+      .btn-toolbar
         = form.input :scope, label: false, required: false, checked: datatable.state[:scope],
           as: (defined?(EffectiveFormInputs) ? :effective_radio_buttons : :radio_buttons),
           collection: datatable._scopes.map { |name, opts| [opts[:label], name] },
@@ -15,7 +15,8 @@
           multiple: opts[:input_html].delete(:multiple),
           input_html: (({name: ''} unless datatable._filters_form_required?) || {}).merge(opts[:input_html])
 
-      - if datatable._filters_form_required?
-        = form.button :submit, 'Apply', 'data-disable-with' => 'Applying...'
-      - else
-        = link_to 'Apply', '#', class: 'btn btn-primary', 'data-apply-datatable-filters' => true
+      .btn-group
+        - if datatable._filters_form_required?
+          = form.button :submit, 'Apply', 'data-disable-with': 'Applying...'
+        - else
+          = link_to 'Apply', '#', class: 'btn btn-primary btn-effective-datatable-filters', 'data-apply-datatable-filters': true

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

@@ -1,5 +1,5 @@
 - Array(datatable.array_collection? ? resource : resource.send(name)).each do |associated|
-  %p
+  .col-resource_item
     - if show_path
       = link_to associated.to_s, send(show_path, associated.to_param), title: associated.to_s
     - elsif edit_path

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.2.4'.freeze
+  VERSION = '3.2.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.2.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails