From b276d224b98dc38bd7287e3f0385d1113829329b Mon Sep 17 00:00:00 2001 From: Luzifer Altenberg Date: Tue, 11 May 2010 14:09:34 +0200 Subject: [PATCH] fix formtastic_haml controller generator, scaffold generator add -f.inputs block around inputs, remove _id from name --- .../formtastic_haml/controller/controller_generator.rb | 2 +- .../formtastic_haml/scaffold/templates/_form.haml.erb | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/generators/formtastic_haml/controller/controller_generator.rb b/lib/generators/formtastic_haml/controller/controller_generator.rb index f0fa704..4b1c85b 100644 --- a/lib/generators/formtastic_haml/controller/controller_generator.rb +++ b/lib/generators/formtastic_haml/controller/controller_generator.rb @@ -1,4 +1,4 @@ -require 'generators/formtastic' +require 'generators/formtastic_haml' require 'rails/generators/named_base' module FormtasticHaml diff --git a/lib/generators/formtastic_haml/scaffold/templates/_form.haml.erb b/lib/generators/formtastic_haml/scaffold/templates/_form.haml.erb index 950f29c..98ce336 100644 --- a/lib/generators/formtastic_haml/scaffold/templates/_form.haml.erb +++ b/lib/generators/formtastic_haml/scaffold/templates/_form.haml.erb @@ -1,9 +1,10 @@ - semantic_form_for @<%= singular_name %> do |form| <%- if attributes.empty? -%> - - form.inputs + = form.inputs <%- else -%> + - form.inputs do <%- for attribute in attributes -%> - = form.input :<%= attribute.name %>, :label => '<%= attribute.name.titleize %>' + = form.input :<%= attribute.name.gsub(/_id$/, '') %>, :label => '<%= attribute.name.titleize %>' <%- end -%> <%- end -%> = form.buttons