Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 3573

Show
Ignore:
Timestamp:
02/12/06 00:22:24 (3 years ago)
Author:
david
Message:

Clean up style around form_for and friends a bit

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/lib/action_view/helpers/form_helper.rb

    r3572 r3573  
    122122      # 
    123123      def form_for(object_name, object, options = {}, &proc) 
    124         concat form_tag(options, options.delete(:html) || {}), proc.binding 
     124        raise ArgumentError, "Missing block" unless block_given? 
     125        concat(form_tag(options, options.delete(:html) || {}), proc.binding) 
    125126        fields_for(object_name, object, options, &proc) 
    126         concat '</form>', proc.binding 
     127        concat('</form>', proc.binding) 
    127128      end 
    128129 
    …… 
    142143      # Like collection_select and datetime_select. 
    143144      def fields_for(object_name, object, options = {}, &proc) 
    144         raise ArgumentError, "fields_for requires a block!" unless block_given? 
    145         builder_klass = options[:builder] || FormBuilder 
    146         form_builder = builder_klass.new(object_name, object, self, options, proc) 
    147         yield form_builder 
     145        raise ArgumentError, "Missing block" unless block_given? 
     146        yield (options[:builder] || FormBuilder).new(object_name, object, self, options, proc) 
    148147      end 
    149148 

  • trunk/actionpack/lib/action_view/helpers/prototype_helper.rb

    r3572 r3573  
    173173      # Works like form_remote_tag, but uses form_for semantics. 
    174174      def remote_form_for(object_name, object, options = {}, &proc) 
    175         concat form_remote_tag(options), proc.binding 
     175        concat(form_remote_tag(options), proc.binding) 
    176176        fields_for(object_name, object, options, &proc) 
    177         concat '</form>', proc.binding 
     177        concat('</form>', proc.binding) 
    178178      end 
    179179      alias_method :form_remote_for, :remote_form_for