aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-11-14 21:28:11 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2010-11-14 21:28:11 -0200
commitbdf70fd3790c5a7df6de53dc54e3dba686ca754a (patch)
tree7f7771d87e4315a2b914b8619589870ca79d758b /actionpack
parent4ef6d2e534e4d470290e1454d51312fa5f8b3b0c (diff)
parentf597d1ec8097d98198a58cb932c2c202c5f0a931 (diff)
downloadrails-bdf70fd3790c5a7df6de53dc54e3dba686ca754a.tar.gz
rails-bdf70fd3790c5a7df6de53dc54e3dba686ca754a.tar.bz2
rails-bdf70fd3790c5a7df6de53dc54e3dba686ca754a.zip
Merge branch 'spastorino-master'
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/form_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index b8a4b0c9cb..f77b138bc6 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -269,8 +269,8 @@ module ActionView
# <%= form_for @person, :url => { :action => "create" }, :builder => LabellingFormBuilder do |f| %>
# <%= f.text_field :first_name %>
# <%= f.text_field :last_name %>
- # <%= text_area :person, :biography %>
- # <%= check_box_tag "person[admin]", @person.company.admin? %>
+ # <%= f.text_area :biography %>
+ # <%= f.check_box :admin %>
# <% end %>
#
# In this case, if you use this: