lib/data_tables.rb in data_tables-0.1.18 vs lib/data_tables.rb in data_tables-0.1.19
- old
+ new
@@ -311,16 +311,16 @@
"#{columns[sort_column][:name]} #{params[:sSortDir_0]}"
end
if named_scope
objects = modelCls.send(named_scope, *args).paginate(:page => current_page,
- :order => order,
+ :order => order,
:conditions => conditions.join(" AND "),
:per_page => params[:iDisplayLength])
else
objects = modelCls.paginate(:page => current_page,
- :order => order,
+ :order => order,
:conditions => conditions.join(" AND "),
:per_page => params[:iDisplayLength])
end
data = objects.collect do |instance|
columns.collect { |column| datatables_instance_get_value(instance, column) }
@@ -386,11 +386,14 @@
proc = lambda { obj = instance; binding }
return Kernel.eval(special[:eval], proc.call)
end
elsif column[:attribute]
val = instance.send(column[:attribute].to_sym)
- return I18n.t(val.to_s.to_sym, :default => val.to_s) if not val.blank?
- return ''
+ if !val.blank? || val == false
+ return I18n.t(val.to_s.to_sym, :default => val.to_s)
+ else
+ return ''
+ end
end
return "value not found"
end
def datatable_source(name)