Changeset 17

Show
Ignore:
Timestamp:
09/28/2006 08:40:07 AM (2 years ago)
Author:
matthew
Message:

Fixed some stupidity around calculated_text and friends.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/auto-admin/lib/auto_admin_controller.rb

    r13 r17  
    9494    def method_missing method, field=nil, options={} 
    9595      associations << field if field && model.reflect_on_association( field ) 
    96       yield if block_given? 
    9796    end 
    9897  end 

  • trunk/auto-admin/lib/auto_admin_django_theme.rb

    r7 r17  
    101101    end 
    102102    def table_cell(field_type, field_name, options) 
    103       column = model.find_column(field_name) 
    104       assoc = model.reflect_on_association(field_name.to_sym) 
    105       if !assoc && !column 
    106         raise [self,@object,model,field_type,field_name,options].inspect 
     103      if field_name 
     104        column = model.find_column(field_name) 
     105        assoc = model.reflect_on_association(field_name.to_sym) 
     106        klass = assoc ? assoc.klass.name.underscore.to_s : column.type.to_s 
     107      else 
     108        klass = '' 
    107109      end 
    108       klass = assoc ? assoc.klass.name.underscore.to_s : column.type.to_s 
    109110 
    110111      was_first, @first = @first, false