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

_updateFields js should start with first list item position of 1, not 0 #1

Open
aepstein wants to merge 16 commits from aepstein/patch-1 into master
pull from: aepstein/patch-1
merge into: github-migration:master
Conversation 1 Commits 16 Files Changed 11 +3 -2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 663a9f344c - Show all commits

4
lib/cocoon/formtastic/cocoon_input.rb
View File

@ -15,10 +15,10 @@ class CocoonInput
end end
output << template.content_tag(:div, :class => 'links') do output << template.content_tag(:div, :class => 'links') do
template.link_to_add_association template.t('.add'), builder, method template.link_to_add_association template.t('.add'), builder, method, input_html_options
end end
template.content_tag(:li, output.join('').html_safe, :class => 'input cocoon') template.content_tag(:li, output.join('').html_safe, wrapper_html_options)
end end
end end

1
lib/cocoon/view_helpers.rb
View File

@ -35,6 +35,7 @@ module Cocoon
partial = get_partial_path(custom_partial, association) partial = get_partial_path(custom_partial, association)
locals = render_options.delete(:locals) || {} locals = render_options.delete(:locals) || {}
method_name = f.respond_to?(:semantic_fields_for) ? :semantic_fields_for : (f.respond_to?(:simple_fields_for) ? :simple_fields_for : :fields_for) method_name = f.respond_to?(:semantic_fields_for) ? :semantic_fields_for : (f.respond_to?(:simple_fields_for) ? :simple_fields_for : :fields_for)
f.send(method_name, association, new_object, {:child_index => "new_#{association}"}.merge(render_options)) do |builder| f.send(method_name, association, new_object, {:child_index => "new_#{association}"}.merge(render_options)) do |builder|
partial_options = {:f => builder, :dynamic => true}.merge(locals) partial_options = {:f => builder, :dynamic => true}.merge(locals)
render(partial, partial_options) render(partial, partial_options)