active_scaffold 3.3.0.rc3 → 3.3.0

data/lib/active_scaffold/bridges/carrierwave/form_ui.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Helpers
     module FormColumnHelpers
       def active_scaffold_input_carrierwave(column, options)
-        options = active_scaffold_input_text_options(options)
+        options = active_scaffold_input_text_options(options.merge(column.options))
         carrierwave = @record.send("#{column.name}")
         if !carrierwave.file.blank?
 
@@ -42,4 +42,4 @@ module ActiveScaffold
       end
     end
   end
-end
+end

data/lib/active_scaffold/bridges/date_picker/helper.rb

@@ -71,7 +71,7 @@ module ActiveScaffold::Bridges
       
       def self.datetime_options(locale)
         begin
-          rails_time_format = I18n.translate! 'time.formats.picker', :locale => locale
+          rails_time_format = I18n.translate! 'time.formats.picker', :locale => locale, :default => '%a, %d %b %Y %H:%M:%S'
           datetime_picker_options = {:ampm => false,
             :hourText => I18n.translate!('datetime.prompts.hour', :locale => locale),
             :minuteText => I18n.translate!('datetime.prompts.minute', :locale => locale),

data/lib/active_scaffold/bridges/dragonfly/form_ui.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Helpers
     module FormColumnHelpers
       def active_scaffold_input_dragonfly(column, options)
-        options = active_scaffold_input_text_options(options)
+        options = active_scaffold_input_text_options(options.merge(column.options))
         input = file_field(:record, column.name, options)
         dragonfly = @record.send("#{column.name}")
         if dragonfly.present?
@@ -24,4 +24,4 @@ module ActiveScaffold
       end
     end
   end
-end
+end

data/lib/active_scaffold/bridges/file_column/as_file_column_bridge.rb

@@ -24,7 +24,7 @@ module ActiveScaffold::Config
       }
     end
     
-    alias_method_chain :initialize, :file_column unless self.instance_methods.include?("initialize_without_file_column")
+    alias_method_chain :initialize, :file_column unless self.instance_methods.include?("initialize_without_file_column".send(::ActiveScaffold::METHOD_CONVERSION))
     
     def configure_file_column_field(field)
       # set list_ui first because it gets its default value from form_ui

data/lib/active_scaffold/bridges/file_column/file_column_helpers.rb

@@ -4,12 +4,12 @@ module ActiveScaffold
       module FileColumnHelpers
         class << self
           def file_column_fields(klass)
-            klass.instance_methods.grep(/_just_uploaded\?$/).collect{|m| m[0..-16].to_sym }
+            klass.instance_methods.select{|m| m.to_s =~ /_just_uploaded\?$/}.collect{|m| m[0..-16].to_sym }
           end
           
           def generate_delete_helpers(klass)
             file_column_fields(klass).each { |field|
-              klass.send :class_eval, <<-EOF, __FILE__, __LINE__ + 1  unless klass.methods.include?("#{field}_with_delete=")
+              klass.send :class_eval, <<-EOF, __FILE__, __LINE__ + 1  unless klass.methods.include?("#{field}_with_delete=".send(::ActiveScaffold::METHOD_CONVERSION))
                 attr_reader :delete_#{field}
                 
                 def delete_#{field}=(value)

data/lib/active_scaffold/bridges/file_column.rb

@@ -1,6 +1,6 @@
 class ActiveScaffold::Bridges::FileColumn < ActiveScaffold::DataStructures::Bridge
   def self.install
-    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_file_column")
+    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_file_column".send(::ActiveScaffold::METHOD_CONVERSION))
       raise RuntimeError, "We've detected that you have active_scaffold_file_column_bridge installed.  This plugin has been moved to core.  Please remove active_scaffold_file_column_bridge to prevent any conflicts"
     end
     require File.join(File.dirname(__FILE__), "file_column/as_file_column_bridge")

data/lib/active_scaffold/bridges/paperclip/form_ui.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Helpers
     module FormColumnHelpers
       def active_scaffold_input_paperclip(column, options)
-        options = active_scaffold_input_text_options(options)
+        options = active_scaffold_input_text_options(options.merge(column.options))
         input = file_field(:record, column.name, options)
         paperclip = @record.send("#{column.name}")
         if paperclip.file?
@@ -24,4 +24,4 @@ module ActiveScaffold
       end
     end
   end
-end
+end

data/lib/active_scaffold/bridges/paperclip/paperclip_bridge_helpers.rb

@@ -6,7 +6,7 @@ module ActiveScaffold
         self.thumbnail_style = :thumbnail
 
         def self.generate_delete_helper(klass, field)
-          klass.class_eval <<-EOF, __FILE__, __LINE__ + 1 unless klass.instance_methods.include?("delete_#{field}=")
+          klass.class_eval <<-EOF, __FILE__, __LINE__ + 1 unless klass.instance_methods.include?("delete_#{field}=".send(::ActiveScaffold::METHOD_CONVERSION))
             attr_reader :delete_#{field}
 
             def delete_#{field}=(value)

data/lib/active_scaffold/bridges/paperclip.rb

@@ -1,6 +1,6 @@
 class ActiveScaffold::Bridges::Paperclip < ActiveScaffold::DataStructures::Bridge
   def self.install
-    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_paperclip")
+    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_paperclip".send(::ActiveScaffold::METHOD_CONVERSION))
       raise RuntimeError, "We've detected that you have active_scaffold_paperclip_bridge installed. This plugin has been moved to core. Please remove active_scaffold_paperclip_bridge to prevent any conflicts"
     end
     require File.join(File.dirname(__FILE__), "paperclip/form_ui")

data/lib/active_scaffold/bridges/tiny_mce/helpers.rb

@@ -16,7 +16,7 @@ class ActiveScaffold::Bridges::TinyMce
         options[:class] = "#{options[:class]} mceEditor #{column.options[:class]}".strip
 				
 				settings = { :theme => 'simple' }.merge(column.options[:tinymce] || {})
-				settings = settings.to_s.gsub(/:(.+?)\=\>/, '\1:')
+        settings = settings.to_json
 				settings = "tinyMCE.settings = #{settings};"
 
         html = []

data/lib/active_scaffold/config/list.rb

@@ -25,10 +25,15 @@ module ActiveScaffold::Config
       @always_show_create = self.class.always_show_create
       @messages_above_header = self.class.messages_above_header
       @auto_select_columns = self.class.auto_select_columns
+      @refresh_with_header = self.class.refresh_with_header
     end
 
     # global level configuration
     # --------------------------
+    # include list header on refresh
+    cattr_accessor :refresh_with_header
+    @@refresh_with_header = false
+
     # how many records to show per page
     cattr_accessor :per_page
     @@per_page = 15
@@ -96,6 +101,9 @@ module ActiveScaffold::Config
     
     public :columns=
 
+    # include list header on refresh
+    attr_accessor :refresh_with_header
+
     # how many rows to show at once
     attr_accessor :per_page
 
@@ -199,7 +207,7 @@ module ActiveScaffold::Config
       attr_writer :label
       # This label has alread been localized.
       def label
-        @label || @conf.label
+        self[:label] || @label || @conf.label
       end
 
       def per_page

data/lib/active_scaffold/constraints.rb

@@ -69,7 +69,7 @@ module ActiveScaffold
 
           # regular column constraints
           elsif column.searchable? && params[column.name] != v
-            active_scaffold_includes.concat column.includes
+            active_scaffold_includes.concat column.includes if column.includes.present?
             conditions << [column.search_sql.collect { |search_sql| "#{search_sql} = ?" }.join(' OR '), *([v] * column.search_sql.size)]
           end
         # unknown-to-activescaffold-but-real-database-column constraint
@@ -79,7 +79,7 @@ module ActiveScaffold
           raise ActiveScaffold::MalformedConstraint, constraint_error(active_scaffold_config.model, k), caller
         end
       end
-      conditions
+      conditions.reject(&:blank?)
     end
 
     # We do NOT want to use .search_sql. If anything, search_sql will refer

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -93,7 +93,7 @@ module ActiveScaffold::DataStructures
         options[:for] ||= @columns.active_record_class
         self.unauthorized_columns = []
         @set.each do |item|
-          unless item.is_a? ActiveScaffold::DataStructures::ActionColumns
+          unless item.is_a? ActiveScaffold::DataStructures::ActionColumns || @columns.nil?
             item = (@columns[item] || ActiveScaffold::DataStructures::Column.new(item.to_sym, @columns.active_record_class))
             next if self.skip_column?(item, options)
           end
@@ -111,7 +111,7 @@ module ActiveScaffold::DataStructures
         # skip if this matches a constrained column
         result = true if constraint_columns.include?(column.name.to_sym)
         # skip this field if it's not authorized
-        unless options[:for].authorized_for?(:action => options[:action], :crud_type => options[:crud_type] || self.action.crud_type, :column => column.name)
+        unless options[:for].authorized_for?(:action => options[:action], :crud_type => options[:crud_type] || self.action.try(:crud_type), :column => column.name)
           self.unauthorized_columns << column.name.to_sym
           result = true
         end

data/lib/active_scaffold/data_structures/action_links.rb

@@ -70,8 +70,8 @@ module ActiveScaffold::DataStructures
 
     def delete(val)
       self.each({:include_set => true}) do |link, set|
-        if link.action == val.to_s
-          set.delete_if {|item| item.is_a?(ActiveScaffold::DataStructures::ActionLink) && item.action == val.to_s}
+        if link.action.to_s == val.to_s
+          set.delete link
         end
       end
     end
@@ -79,7 +79,7 @@ module ActiveScaffold::DataStructures
     def delete_group(name)
       @set.each do |group|
         if group.name == name
-          @set.delete_if {|item| item.is_a?(ActiveScaffold::DataStructures::ActionLinks) && item.name == name}
+          @set.delete group
         else
           group.delete_group(name)
         end if group.is_a?(ActiveScaffold::DataStructures::ActionLinks)

data/lib/active_scaffold/data_structures/column.rb

@@ -174,6 +174,18 @@ module ActiveScaffold::DataStructures
       end
     end
 
+    # a collection of associations to do left join when this column is included on search
+    def search_joins
+      @search_joins || @includes
+    end
+
+    def search_joins=(value)
+      @search_joins = case value
+        when Array then value 
+        else [value] # automatically convert to an array
+      end
+    end
+
     # a collection of columns to load when eager loading is disabled, if it's nil all columns will be loaded
     attr_accessor :select_associated_columns
 
@@ -335,7 +347,10 @@ module ActiveScaffold::DataStructures
       
       @weight = estimate_weight
 
-      self.includes = (association and not polymorphic_association?) ? [association.name] : []
+      if association && !polymorphic_association?
+        self.includes = [association.name]
+        self.search_joins = self.includes.clone
+      end
     end
 
     # just the field (not table.field)

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -43,11 +43,23 @@ module ActionView::Helpers #:nodoc:
         constraints = options[:constraints]
         conditions = options[:conditions]
         eid = Digest::MD5.hexdigest(params[:controller] + remote_controller.to_s + constraints.to_s + conditions.to_s)
-        eid_info = {}
-        eid_info[:constraints] = constraints if constraints
-        eid_info[:conditions] = conditions if conditions
-        eid_info[:list] = {:label => args.first[:label]} if args.first[:label]
-        session["as:#{eid}"] = eid_info
+        eid_info = session["as:#{eid}"] ||= {}
+        if constraints
+          eid_info[:constraints] = constraints 
+        else
+          eid_info.delete :constraints
+        end
+        if conditions
+          eid_info[:conditions] = conditions
+        else
+          eid_info.delete :conditions
+        end
+        if options[:label]
+          eid_info[:list] = {:label => options[:label]}
+        else
+          eid_info.delete :list
+        end
+        session.delete "as:#{eid}" if eid_info.empty?
         options[:params] ||= {}
         options[:params].merge! :eid => eid, :embedded => true
 

data/lib/active_scaffold/extensions/left_outer_joins.rb

@@ -0,0 +1,33 @@
+module ActiveScaffold
+  module OuterJoins
+    def outer_joins(*assocs)
+      joins(outer_joins_sql(*assocs))
+    end
+
+    private
+    def outer_joins_sql(*assocs)
+      assocs.collect do |assoc|
+        if assoc.is_a? Array
+          outer_joins_sql(*assoc)
+        elsif assoc.is_a? Hash
+          assoc.collect do |key, val|
+            [left_outer_join_sql(key), klass.reflect_on_association(key).klass.outer_joins_sql(*val)]
+          end
+        elsif assoc.is_a? Symbol
+          left_outer_join_sql(assoc)
+        elsif assoc
+          assoc
+        end
+      end.flatten.compact
+    end
+
+    def left_outer_join_sql(association_name)
+      t = ActiveRecord::Associations::JoinDependency.new(klass, association_name, []).join_associations.first.join_relation(klass).arel
+      t.joins(t)
+    end
+  end
+end
+ActiveRecord::Relation.send :include, ActiveScaffold::OuterJoins
+module ActiveRecord::Querying
+  delegate :outer_joins, :outer_joins_sql, :to => :scoped
+end

data/lib/active_scaffold/extensions/paginator_extensions.rb

@@ -20,6 +20,14 @@ class Paginator
       next_without_infinite?
     end
     alias_method_chain :next?, :infinite
+
+    def empty?
+      if @pager.infinite?
+        items.to_a.empty?
+      else
+        @pager.count == 0
+      end
+    end
   end
 
 end

data/lib/active_scaffold/extensions/unsaved_associated.rb

@@ -47,10 +47,10 @@ class ActiveRecord::Base
   # returns false if any yield returns false.
   # returns true otherwise, even when none of the associations have been instantiated. build wrapper methods accordingly.
   def with_unsaved_associated
-    associations_for_update.all? do |association|
-      association_proxy = send(association.name)
-      if association_proxy
-        records = association_proxy
+    associations_for_update.all? do |assoc|
+      association_proxy = self.association(assoc.name)
+      if association_proxy.target.present?
+        records = association_proxy.target
         records = [records] unless records.is_a? Array # convert singular associations into collections for ease of use
         records.select {|r| r.unsaved? and not r.readonly?}.all? {|r| yield r} # must use select instead of find_all, which Rails overrides on association proxies for db access
       else

data/lib/active_scaffold/finder.rb

@@ -292,6 +292,11 @@ module ActiveScaffold
       @active_scaffold_habtm_joins ||= []
     end
     
+    attr_writer :active_scaffold_outer_joins
+    def active_scaffold_outer_joins
+      @active_scaffold_outer_joins ||= []
+    end
+
     def all_conditions
       [
         active_scaffold_conditions,                   # from the search modules
@@ -299,7 +304,7 @@ module ActiveScaffold
         conditions_from_params,                       # from the parameters (e.g. /users/list?first_name=Fred)
         conditions_from_constraints,                  # from any constraints (embedded scaffolds)
         active_scaffold_session_storage[:conditions] # embedding conditions (weaker constraints)
-      ]
+      ].reject(&:blank?)
     end
     
     # returns a single record (the given id) but only if it's allowed for the specified security options.
@@ -324,6 +329,7 @@ module ActiveScaffold
       finder_options = { :reorder => options[:sorting].try(:clause),
                          :conditions => search_conditions,
                          :joins => joins_for_finder,
+                         :outer_joins => active_scaffold_outer_joins,
                          :includes => full_includes,
                          :select => options[:select]}
     
@@ -332,7 +338,7 @@ module ActiveScaffold
     end
 
     def count_items(find_options = {}, count_includes = nil)
-      count_includes ||= find_options[:includes] unless find_options[:conditions].nil?
+      count_includes ||= find_options[:includes] unless find_options[:conditions].blank?
       options = find_options.reject{|k,v| [:select, :reorder].include? k}
       options[:includes] = count_includes
       
@@ -377,22 +383,22 @@ module ActiveScaffold
       pager.page(options[:page])
     end
 
-    def calculate(column)
+    def calculate_query
       conditions = all_conditions
       includes = active_scaffold_config.list.count_includes
-      includes ||= active_scaffold_includes unless conditions.nil?
+      includes ||= active_scaffold_includes unless conditions.blank?
       primary_key = active_scaffold_config.model.primary_key
-      subquery = append_to_query(beginning_of_chain, :conditions => conditions, :joins => joins_for_collection)
+      subquery = append_to_query(beginning_of_chain, :conditions => conditions, :joins => joins_for_finder, :outer_joins => active_scaffold_outer_joins)
       subquery = subquery.select(active_scaffold_config.columns[primary_key].field)
       if includes
         includes_relation = beginning_of_chain.includes(includes)
         subquery = subquery.send(:apply_join_dependency, subquery, includes_relation.send(:construct_join_dependency_for_association_find))
       end
-      beginning_of_chain.where(primary_key => subquery).calculate(column.calculate, column.name)
+      active_scaffold_config.model.where(primary_key => subquery)
     end
     
     def append_to_query(query, options)
-      options.assert_valid_keys :where, :select, :group, :reorder, :limit, :offset, :joins, :includes, :lock, :readonly, :from, :conditions
+      options.assert_valid_keys :where, :select, :group, :reorder, :limit, :offset, :joins, :outer_joins, :includes, :lock, :readonly, :from, :conditions
       query = apply_conditions(query, *options[:conditions]) if options[:conditions]
       options.reject{|k, v| k == :conditions || v.blank?}.inject(query) do |query, (k, v)|
         query.send((k.to_sym), v) 

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -2,11 +2,21 @@ module ActiveScaffold
   module Helpers
     module ControllerHelpers
       def self.included(controller)
-        controller.class_eval { helper_method :params_for, :conditions_from_params, :main_path_to_return, :render_parent?, :render_parent_options, :render_parent_action, :nested_singular_association?, :build_associated}
+        controller.class_eval { helper_method :params_for, :conditions_from_params, :main_path_to_return, :render_parent?, :render_parent_options, :render_parent_action, :nested_singular_association?, :build_associated, :generate_temporary_id, :generated_id}
       end
       
       include ActiveScaffold::Helpers::IdHelpers
       
+      def generate_temporary_id(record = nil, generated_id = nil)
+        (generated_id || (Time.now.to_f*1000).to_i.to_s).tap do |id|
+          (@temporary_ids ||= {})[record.class.name] = id if record
+        end
+      end
+
+      def generated_id(record)
+        @temporary_ids[record.class.name] if record && @temporary_ids
+      end
+
       def params_for(options = {})
         # :adapter and :position are one-use rendering arguments. they should not propagate.
         # :sort, :sort_direction, and :page are arguments that stored in the session. they need not propagate.

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -4,19 +4,17 @@ module ActiveScaffold
     module FormColumnHelpers
       # This method decides which input to use for the given column.
       # It does not do any rendering. It only decides which method is responsible for rendering.
-      def active_scaffold_input_for(column, scope = nil, options = {})
-        options = active_scaffold_input_options(column, scope, options)
+      def active_scaffold_input_for(column, scope = nil, options = nil)
+        options ||= active_scaffold_input_options(column, scope)
         options = update_columns_options(column, scope, options)
         active_scaffold_render_input(column, options)
       end
 
-      alias form_column active_scaffold_input_for
-
       def active_scaffold_render_input(column, options)
         begin
           # first, check if the dev has created an override for this specific field
           if (method = override_form_field(column))
-            send(method, @record, options)
+            send(method, options[:object] || @record, options)
           # second, check if the dev has specified a valid form_ui for this column
           elsif column.form_ui and (method = override_input(column.form_ui))
             send(method, column, options)
@@ -31,7 +29,7 @@ module ActiveScaffold
                 raise "Unknown form_ui `#{column.form_ui}' for column `#{column.name}'"
               end
             elsif column.virtual?
-              options[:value] = format_number_value(@record.send(column.name), column.options) if column.number?
+              options[:value] = format_number_value((options[:object] || @record).send(column.name), column.options) if column.number?
               active_scaffold_input_virtual(column, options)
 
             else # regular model attribute column
@@ -48,7 +46,7 @@ module ActiveScaffold
                   options[:size] ||= ActionView::Helpers::InstanceTag::DEFAULT_FIELD_OPTIONS["size"]
                 end
                 options[:include_blank] = true if column.column.null and [:date, :datetime, :time].include?(column.column.type)
-                options[:value] = format_number_value(@record.send(column.name), column.options) if column.number?
+                options[:value] = format_number_value((options[:object] || @raecord).send(column.name), column.options) if column.number?
                 text_field(:record, column.name, options.merge(column.options))
               end
             end
@@ -69,7 +67,7 @@ module ActiveScaffold
           col_class = col_class.join(' ')
         end
         unless readonly and not @record.new_record? or not @record.authorized_for?(:crud_type => crud_type, :column => column.name)
-          render :partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope, :col_class => col_class }
+          render_column(column, @record, column_renders_as(column), scope, false, col_class)
         else
           options = active_scaffold_input_options(column, scope).except(:name)
           options[:class] = "#{options[:class]} #{col_class}" if col_class
@@ -95,7 +93,7 @@ module ActiveScaffold
         options[:placeholder] = column.placeholder if column.placeholder.present?
 
         # Fix for keeping unique IDs in subform
-        id_control = "record_#{column.name}_#{[params[:eid], params[:id]].compact.join '_'}"
+        id_control = "record_#{column.name}_#{[params[:eid], params[:parent_id] || params[:id]].compact.join '_'}"
         id_control += scope_id(scope) if scope
         
         classes = "#{column.name}-input"
@@ -112,12 +110,13 @@ module ActiveScaffold
           active_scaffold_config.send(@record.new_record? ? :create : :update)
         end
         if form_action && column.update_columns && (column.update_columns & form_action.columns.names).present?
-          url_params = {:action => 'render_field', :column => column.name, :id => nil}
-          url_params[:id] = @record.id if column.send_form_on_update_column
+          url_params = params_for(:action => 'render_field', :column => column.name, :id => @record.id)
+          url_params = url_params.except(:parent_scaffold, :association, nested.param_name) if nested? && scope
           url_params[:eid] = params[:eid] if params[:eid]
           if scope
             url_params[:controller] = subform_controller.controller_path
             url_params[:scope] = scope
+            url_params[:parent_id] = params[:parent_id] || params[:id]
           end
 
           options[:class] = "#{options[:class]} update_form".strip
@@ -131,6 +130,43 @@ module ActiveScaffold
       def field_attributes(column, record)
         {}
       end
+      
+      def render_column(column, record, renders_as, scope = nil, only_value = false, col_class = nil)
+        if override_form_field_partial?(column)
+          render :partial => override_form_field_partial(column), :locals => { :column => column, :only_value => only_value, :scope => scope, :col_class => col_class }
+        elsif renders_as == :field || override_form_field?(column)
+          form_attribute(column, record, scope, only_value)
+        elsif renders_as == :subform
+          render :partial => 'form_association', :locals => { :column => column, :scope => scope }
+        else
+          form_hidden_attribute(column, record, scope)
+        end
+      end
+      
+      def form_attribute(column, record, scope = nil, only_value = false, col_class = nil)
+        column_options = active_scaffold_input_options(column, scope)
+        attributes = field_attributes(column, record)
+        attributes[:class] = "#{attributes[:class]} #{col_class}" if col_class.present?
+        field = unless only_value
+          active_scaffold_input_for column, scope, column_options.merge(:object => record)
+        else
+          content_tag(:span, get_column_value(@record, column), column_options.except(:name)) <<
+          hidden_field(:record, column.association ? column.association.foreign_key : column.name, column_options.merge(:object => record))
+        end
+        
+        content_tag :dl, attributes do
+          %|<dt>#{label_tag column_options[:id], column.label}</dt><dd>#{field}
+#{loading_indicator_tag(:action => :render_field, :id => params[:id]) if column.update_columns}
+#{content_tag :span, column.description, :class => 'description' if column.description.present?}
+</dd>|.html_safe
+        end
+      end
+      
+      def form_hidden_attribute(column, record, scope = nil)
+        %|<dl style="display: none;"><dt></dt><dd>
+#{hidden_field :record, column.name, active_scaffold_input_options(column, scope).merge(:object => record)}
+</dd></dl>|.html_safe
+      end
 
       ##
       ## Form input methods
@@ -156,7 +192,7 @@ module ActiveScaffold
         select_options.unshift(associated) unless associated.nil? || select_options.include?(associated)
 
         method = column.name
-        options = {:selected => associated.try(:id), :include_blank => as_(:_select_)}
+        options = {:selected => associated.try(:id), :include_blank => as_(:_select_), :object => html_options.delete(:object)}
 
         html_options.update(column.options[:html_options] || {})
         options.update(column.options)
@@ -210,7 +246,7 @@ module ActiveScaffold
       end
 
       def active_scaffold_input_enum(column, html_options)
-        options = { :selected => @record.send(column.name) }
+        options = { :selected => @record.send(column.name), :object => html_options.delete(:object) }
         options_for_select = active_scaffold_enum_options(column).collect do |text, value|
           active_scaffold_translated_option(column, text, value)
         end
@@ -342,19 +378,6 @@ module ActiveScaffold
       end
       alias_method :override_input?, :override_input
 
-      def form_partial_for_column(column, renders_as = nil)
-        renders_as ||= column_renders_as(column)
-        if override_form_field_partial?(column)
-          override_form_field_partial(column)
-        elsif renders_as == :field or override_form_field?(column)
-          "form_attribute"
-        elsif renders_as == :subform
-          "form_association"
-        elsif renders_as == :hidden
-          "form_hidden_attribute"
-        end
-      end
-
       def subform_partial_for_column(column)
         subform_partial = "#{active_scaffold_config_for(column.association.klass).subform.layout}_subform"
         if override_subform_partial?(column, subform_partial)
@@ -373,7 +396,7 @@ module ActiveScaffold
           return :subsection
         elsif column.active_record_class.locking_column.to_s == column.name.to_s or column.form_ui == :hidden
           return :hidden
-        elsif column.association.nil? or column.form_ui or !active_scaffold_config_for(column.association.klass).actions.include?(:subform)
+        elsif column.association.nil? or column.form_ui or !active_scaffold_config_for(column.association.klass).actions.include?(:subform) or override_form_field?(column)
           return :field
         else
           return :subform

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -226,7 +226,9 @@ module ActiveScaffold
           column = column.clone
           column.options = column.options.clone
           column.form_ui = :select if (column.association && column.form_ui.nil?)
-          content_tag(:div, active_scaffold_input_for(column), :style => "display:none;", :class => inplace_edit_control_css_class).tap do
+          options = active_scaffold_input_options(column)
+          options[:class] = "#{options[:class]} inplace_field"
+          content_tag(:div, active_scaffold_input_for(column, nil, options), :style => "display:none;", :class => inplace_edit_control_css_class).tap do
             @record = old_record
           end
         end
@@ -300,12 +302,16 @@ module ActiveScaffold
                      :remote => true, :method => :get}
           url_options = params_for(:action => :index, :page => 1,
                            :sort => column.name, :sort_direction => sort_direction)
-          link_to column.label, url_options, options
+          link_to column_heading_label(column), url_options, options
         else
-          content_tag(:p, column.label)
+          content_tag(:p, column_heading_label(column))
         end
       end
       
+      def column_heading_label(column)
+        column.label
+      end
+      
       def render_nested_view(action_links, record)
         rendered = []
         action_links.member.each do |link|