app/models/effective/effective_datatable/resource.rb in effective_datatables-3.0.14 vs app/models/effective/effective_datatable/resource.rb in effective_datatables-3.0.15
- old
+ new
@@ -22,15 +22,15 @@
opts[:sql_column] = (resource.sql_column(name) || false) if opts[:sql_column].nil?
case opts[:as]
when *resource.macros
opts[:resource] = Effective::Resource.new(resource.associated(name), namespace: controller_namespace)
- opts[:sql_column] ||= name
+ (opts[:sql_column] = name) if opts[:sql_column].nil?
when Class
if opts[:as].ancestors.include?(ActiveRecord::Base)
opts[:resource] = Effective::Resource.new(opts[:as], namespace: controller_namespace)
opts[:as] = :resource
- opts[:sql_column] ||= name
+ (opts[:sql_column] = name) if opts[:sql_column].nil?
end
when :effective_addresses
opts[:resource] = Effective::Resource.new(resource.associated(name), namespace: controller_namespace)
opts[:sql_column] = :effective_addresses
when :effective_roles