kotovalexarian-likes-github
/
activerecord-hackery--ransack
mirror of https://github.com/activerecord-hackery/ransack.git
1
0
Fork 0
Code Releases Activity

Refactor form_builder

This commit is contained in:
jonatack 2013-12-10 13:04:42 +01:00
parent 025e229bfe
commit 382537bc55
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/ransack/helpers/form_builder.rb
View File

@ -31,13 +31,15 @@ module Ransack
bases = [''] + association_array(options[:associations])
if bases.size > 1
collection = attribute_collection_for_bases(action, bases)
object.name ||= default if object.respond_to?(:name=) && default &&
collection.flatten(2).map{|a| a.is_a?(Array) ? a.first : nil}.compact.include?(default.to_s)
object.name ||= default if can_use_default?(
default, :name, mapped_values(collection.flatten(2))
)
template_grouped_collection_select(collection, options, html_options)
else
collection = collection_for_base(action, bases.first)
object.name ||= default if object.respond_to?(:name=) && default &&
collection.map{|a| a.is_a?(Array) ? a.first : nil}.compact.include?(default.to_s)
object.name ||= default if can_use_default?(
default, :name, mapped_values(collection)
)
template_collection_select(:name, collection, options, html_options)
end
end
@ -113,8 +115,9 @@ module Ransack
end
end
collection = keys.map { |k| [k, Translate.predicate(k)] }
object.predicate ||= Predicate.named(default) if object.respond_to?(:predicate=) &&
default && keys.include?(default.to_s)
object.predicate ||= Predicate.named(default) if can_use_default?(
default, :predicate, keys
)
template_collection_select(:p, collection, options, html_options)
end
@ -138,6 +141,15 @@ module Ransack
)
end
def can_use_default?(default, attribute, values)
object.respond_to?("#{attribute}=") && default &&
values.include?(default.to_s)
end
def mapped_values(values)
values.map { |v| v.is_a?(Array) ? v.first : nil }.compact
end
def sort_array
[['asc', object.translate('asc')], ['desc', object.translate('desc')]]
end