Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for complex-form-examples for Rails 3 #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Updated to work with Rails 3 changes to block helpers.

Complex Form Examples - 2 level nesting
----------------------------------------

Expand All @@ -8,4 +10,4 @@ Example of nested forms with 2 level nesting.
- Most of the javascript is extracted to application.js

Rails is vendored using a Git submodule to official repository:
git://github.com/rails/rails.git
git://github.com/rails/rails.git
2 changes: 1 addition & 1 deletion app/views/projects/_color.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<p>
<%= f.label :name, "Color:" %>
<%= f.text_field :name %>
<%= remove_link_unless_new_record(f) -%>
<%= remove_link_unless_new_record(f).html_safe -%>
</p>
</div>
6 changes: 3 additions & 3 deletions app/views/projects/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

<% form_for @project do |project_form| -%>

<% content_for :jstemplates do -%>
<%= "var task='#{generate_template(project_form, :tasks)}'" %>
<%= "var tag='#{generate_template(project_form, :tags)}'" %>
<%= content_for :jstemplates do -%>
<%=raw "var task='#{generate_template(project_form, :tasks)}'" %>
<%=raw "var tag='#{generate_template(project_form, :tags)}'" %>
<% end -%>


Expand Down
2 changes: 1 addition & 1 deletion app/views/projects/_task.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<%= f.label :raise_exception, "Raise exception:" %>
<%= f.check_box :raise_exception %>
<%= remove_link_unless_new_record(f) -%>
<%= remove_link_unless_new_record(f).html_safe -%>
</p>

<div class="colors">
Expand Down