Changeset 888

Show
Ignore:
Timestamp:
11/06/07 23:55:51 (1 year ago)
Author:
wyca..@gmail.com
Message:

Some tweaks to improve form interoperability between AR and DM

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/merb_helpers/lib/form_helpers.rb

    r758 r888  
    44     
    55      def error_messages_for(obj, error_li = nil, html_class='submittal_failed') 
    6         return "" unless obj.errors 
    7         header_message = block_given? ? yield(obj.errors) : "<h2>Form submittal failed because of #{obj.errors.size} problems</h2>" 
     6        return "" if obj.errors.empty? 
     7        header_message = block_given? ? yield(obj.errors) : "<h2>Form submittal failed because of #{obj.errors.size} #{obj.errors.size == 1 ? 'problem' : 'problems'}</h2>" 
    88        ret = %Q{ 
    99          <div class='#{html_class}'> 
    …… 
    1111            <ul> 
    1212        } 
    13         obj.errors.each {|err| ret << (error_li ? error_li.call(err) : "<li>#{err[0]} #{err[1]}</li>") } 
     13        obj.errors.each {|err| ret << (error_li ? error_li.call(err) : "<li>#{err.join(" ")}</li>") } 
    1414        ret << %Q{ 
    1515            </ul>