@@ -6,31 +6,47 @@ module Merb id = (object_symbol==nil) ? attribute.to_s : "#{object_symbol}_#{attribute}" name = (object_symbol==nil) ? attribute.to_s : "#{object_symbol}[#{attribute}]" - label = values.delete(:label) || humanize_symbol(attribute) + if values.keys.include?(:label) + label = values.delete(:label) + else + label = humanize_symbol(attribute) + end + after_text = values.delete(:after) + # check if the object is here and the method is public - value = (values.delete(:value) || ((object==nil) ? nil : (object.public_methods.include?(attribute.to_s) ? object.send(attribute) : nil))) + control = values.delete(:control) + html = error_message = '' - html = '' - if self.negative_captcha_form? - html = negative_control(control, values.merge({:id => id, :name => name, :value => value})) - else - if self.respond_to?("control_#{control}") - html = self.send("control_#{control}", values.merge({:id => id, :name => name, :value => value})) + if (control) + value = (values.delete(:value) || ((object==nil) ? nil : (object.public_methods.include?(attribute.to_s) ? object.send(attribute) : nil))) + + if self.negative_captcha_form? + html = negative_control(control, values.merge({:id => id, :name => name, :value => value})) else - html = "unknown control #{control.inspect}" + if self.respond_to?("control_#{control}") + html = self.send("control_#{control}", values.merge({:id => id, :name => name, :value => value})) + else + html = "unknown control #{control.inspect}" + end end - end - error_message = "" - if object!=nil and object.errors and object.errors.on(attribute) and object.errors.on(attribute).size > 0 - object.errors.on(attribute).each do |error| - error_message << tag(:div, error) + if object!=nil and object.errors and object.errors.on(attribute) and object.errors.on(attribute).size > 0 + object.errors.on(attribute).each do |error| + error_message << tag(:div, error) + end + error_message = tag(:div, error_message, :class => 'errors') end - error_message = tag(:div, error_message, :class => 'errors') end - - html = tag(:label, label+":", :for => id) + html + + if label + html = tag(:label, label+":", :for => id) + html + end + + if after_text + html = html + " " + after_text + end + tag(:div, html, :class => "row #{values[:control]} #{error_message!='' ? 'has_errors' : ''}") + error_message end @@ -59,7 +75,7 @@ module Merb alias_method :control_file, :control_file_field def control_select(options={}) - options[:selected] = options.delete(:value) + options[:selected] = options.delete(:value).to_s select(options) end lib/merb-simple-forms/controls.rb @@ -52,7 +52,7 @@ module Merb if cancel_url.nil? && object_symbol if namespace.nil? || namespace.empty? if nested_within and parent - cancel_url = resource(parent, object_symbol.to_s.pluralize.intern) + cancel_url = resource(parent, (form_definition[:route_name] || object_symbol.to_s.pluralize.intern)) else cancel_url = url(object_symbol.to_s.pluralize.intern) end @@ -92,7 +92,7 @@ module Merb if namespace url("#{namespace}_#{nested_within.singular}_#{route_name}".intern, (nested_within.to_s.singularize + "_id").intern => ( (parent.respond_to?(:slug) && !disable_slug) ? parent.slug : parent.id)) else - resource(parent, route_name.intern) + resource(parent, (route_name.class == Symbol ? route_name : route_name.intern)) end else route_name ||= object.class.storage_name.singular lib/merb-simple-forms/simple-forms-helpers.rb a27c0630fa3cf3d757a1992b0d50b8f91e09c82d Maxime Guilbot maxime@ekohe.com http://github.com/maxime/merb-simple-forms/commit/1c249b37e466342003416b4d99da6fb7c77108f5 1c249b37e466342003416b4d99da6fb7c77108f5 2009-05-16T09:09:55-07:00 2009-05-16T09:09:55-07:00 Added support of the :after_text option (useful for check boxes) Some route fixing af068f807a24bc8ba70f4912e2eaf9c37f759d37 Maxime Guilbot maxime@ekohe.com