github-migration
/
semantic_rails_view_helpers
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:johnbintz/semantic_rails_view_helpers

This commit is contained in:
John Bintz 2013-03-12 17:12:33 -04:00
parent 1854b5ac37 820c7cf5d2
commit d264b5219b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/semantic_rails_view_helpers/attributes_builder_base.rb
View File

@ -17,9 +17,9 @@ module SemanticRailsViewHelpers
end end
def field(field, options = {}, &block) def field(field, options = {}, &block)
if options[:value] raw_value = options.delete(:value)
raw_value = options[:value]
else if !raw_value
raw_value = @object.send(field) raw_value = @object.send(field)
if block if block
@ -30,12 +30,12 @@ module SemanticRailsViewHelpers
value = raw_value value = raw_value
value = value.to_label if value.respond_to?(:to_label) value = value.to_label if value.respond_to?(:to_label)
if options[:raw] if options.delete(:raw)
value = (value || '').html_safe value = (value || '').html_safe
end end
if SemanticRailsViewHelpers.semantic_data? if SemanticRailsViewHelpers.semantic_data?
value = @context.content_tag(:data, value, 'data-field' => field) value = @context.content_tag(:data, value, options.merge('data-field' => field))
end end
if options[:as] if options[:as]