effective_datatables 2.6.14 → 2.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e74b48943a26fed6030dccee8555337684bc4c49
-  data.tar.gz: ef20573e54accb0e2135e66a6c9f77a8720c51af
+  metadata.gz: 9d928965ede9ce8dfc004b6f2653cac420eee7c6
+  data.tar.gz: b1612ccf4823b60f283d4c7f885b4b1224774dd4
 SHA512:
-  metadata.gz: 01980cdb85274c5cf73a7131bbbe8ef9b1873930eb61a03b23bcec45b62e97f4c79bd3e59c9fa298306da752de323127cf556670fe351de2e69f77f33c516ff7
-  data.tar.gz: b163136bc40e04ec0cc698b9ff20c58e97402573071ee47a67513d710140fbb00e031e5388b9c34a1140af4a232d3751fccb3823aa239406551b43f3614f078b
+  metadata.gz: 7f26405d6274b823095d11290b1573114ace9ba17b386f59658b31d6fc27b9025bd3b04a24e9360f9e44700bcaa739edcca138f6686ac0cd365947f17b7ecb83
+  data.tar.gz: 4b622c39357d491f66baac5e773b86e0cfb0bd9ca98f4e80e8632771d8ea96febc437bd749f0819d8765b92915d7a0e9029acf00c0f61f77123a90b54eea0709

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

@@ -146,7 +146,8 @@ module Effective
             cols[name][:column] = sql_table.present? ? "#{quote_sql(sql_table.name)}.#{quote_sql('roles_mask')}" : name
           end
 
-          if sql_table.present? && sql_column.blank? && !cols[name][:array_column] # This is a SELECT AS column, or a JOIN column
+          # This is a SELECT AS column, or a JOIN column or a delegated object
+          if sql_table.present? && sql_column.blank? && !cols[name][:array_column]
             cols[name][:sql_as_column] = true
           end
 

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

@@ -118,7 +118,7 @@ module Effective
               elsif obj.kind_of?(Array) # Array backed collection
                 obj[opts[:array_index]]
               elsif opts[:sql_as_column]
-                obj[name]
+                obj[name] || obj.send(name)
               else
                 obj.send(name)
               end
@@ -219,8 +219,6 @@ module Effective
       def add_actions_column_locals(locals)
         return unless active_record_collection?
 
-        # Consider authorization levels first
-
         if locals[:show_action] == :authorize
           locals[:show_action] = (EffectiveDatatables.authorized?(controller, :show, collection_class) rescue false)
         end
@@ -244,6 +242,7 @@ module Effective
         begin
           resource = collection_class.new(id: 123)
           resource.define_singleton_method(:persisted?) { true }  # We override persisted? to get the correct action urls
+          raise 'no to param' unless resource.to_param.present?
         rescue => e
           return
         end
@@ -261,7 +260,7 @@ module Effective
 
           # So if we have a URL, this is an action we can link to
           if url
-            locals[:show_path] = url.gsub('123', ':to_param')
+            locals[:show_path] = url.gsub("/#{resource.to_param}", '/:to_param')
           else
             locals[:show_action] = false
           end
@@ -280,7 +279,7 @@ module Effective
 
           # So if we have a URL, this is an action we can link to
           if url
-            locals[:edit_path] = url.gsub('123', ':to_param')
+            locals[:edit_path] = url.gsub("/#{resource.to_param}", '/:to_param')
           else
             locals[:edit_action] = false
           end
@@ -299,7 +298,7 @@ module Effective
 
           # So if we have a URL, this is an action we can link to
           if url
-            locals[:destroy_path] = url.gsub('123', ':to_param')
+            locals[:destroy_path] = url.gsub("/#{resource.to_param}", '/:to_param')
           else
             locals[:destroy_action] = false
           end
@@ -319,7 +318,7 @@ module Effective
 
             # So if we have a URL, this is an action we can link to
             if url
-              locals[:unarchive_path] = url.gsub('123', ':to_param')
+              locals[:unarchive_path] = url.gsub("/#{resource.to_param}", '/:to_param')
             else
               locals[:unarchive_action] = false
             end

data/lib/effective_datatables/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.6.14
+  version: 2.6.15
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails