active_scaffold 3.3.0 → 3.3.1

data/lib/active_scaffold.rb

@@ -16,7 +16,6 @@ require 'active_scaffold/engine' unless defined? ACTIVE_SCAFFOLD_PLUGIN
 require 'json'  # for js_config
 
 module ActiveScaffold
-  METHOD_CONVERSION = RUBY_VERSION < '1.9' ? :to_s : :to_sym
   autoload :AttributeParams, 'active_scaffold/attribute_params'
   autoload :Configurable, 'active_scaffold/configurable'
   autoload :Constraints, 'active_scaffold/constraints'
@@ -108,7 +107,8 @@ module ActiveScaffold
       active_scaffold_config.actions.each do |action_name|
         conf_instance = active_scaffold_config.send(action_name) rescue next
         next if conf_instance.class::UserSettings == ActiveScaffold::Config::Base::UserSettings # if it hasn't been extended, skip it
-        conf_instance.user = conf_instance.class::UserSettings.new(conf_instance, active_scaffold_session_storage, params)
+        storage = active_scaffold_config.store_user_settings ? active_scaffold_session_storage : {}
+        conf_instance.user = conf_instance.class::UserSettings.new(conf_instance, storage, params)
       end
     end
   end

data/lib/active_scaffold/actions/common_search.rb

@@ -2,11 +2,15 @@ module ActiveScaffold::Actions
   module CommonSearch
     protected
     def store_search_params_into_session
-      active_scaffold_session_storage[:search] = params.delete :search if params[:search]
+      if active_scaffold_config.store_user_settings
+        active_scaffold_session_storage[:search] = params.delete :search if params[:search]
+      else
+        @search_params = params.delete :search
+      end
     end
-    
+
     def search_params
-      active_scaffold_session_storage[:search]
+      @search_params || active_scaffold_session_storage[:search]
     end
 
     def search_ignore?

data/lib/active_scaffold/actions/core.rb

@@ -7,6 +7,7 @@ module ActiveScaffold::Actions
         after_filter :clear_storage
         rescue_from ActiveScaffold::RecordNotAllowed, ActiveScaffold::ActionNotAllowed, :with => :deny_access
       end
+      base.helper_method :successful?
       base.helper_method :nested?
       base.helper_method :calculate_query
       base.helper_method :new_model

data/lib/active_scaffold/actions/field_search.rb

@@ -6,6 +6,7 @@ module ActiveScaffold::Actions
       base.before_filter :store_search_params_into_session, :only => [:index]
       base.before_filter :do_search, :only => [:index]
       base.helper_method :field_search_params
+      base.helper_method :search_params
     end
 
     # FieldSearch uses params[:search] and not @record because search conditions do not always pass the Model's validations.
@@ -51,7 +52,7 @@ module ActiveScaffold::Actions
           column = active_scaffold_config.columns[key]
           search_condition = self.class.condition_for_column(column, value, text_search)
           unless search_condition.blank?
-            self.active_scaffold_outer_joins << column.search_joins unless column.includes.present? && list_columns.include?(column)
+            self.active_scaffold_outer_joins << column.search_joins unless active_scaffold_config.list.user.count_includes.nil? && column.includes.present? && list_columns.include?(column)
             self.active_scaffold_conditions << search_condition
             filtered_columns << column
           end

data/lib/active_scaffold/actions/list.rb

@@ -61,7 +61,12 @@ module ActiveScaffold::Actions
     # The actual algorithm to prepare for the list view
     def set_includes_for_columns(action = :list)
       @cache_associations = true
-      includes_for_list_columns = active_scaffold_config.send(action).columns.collect_visible(:flatten => true){ |c| c.includes }.flatten.uniq.compact
+      columns = if respond_to?(:"#{action}_columns")
+        send(:"#{action}_columns")
+      else
+        active_scaffold_config.send(action).columns.collect_visible(:flatten => true)
+      end
+      includes_for_list_columns = columns.map{ |c| c.includes }.flatten.uniq.compact
       self.active_scaffold_includes.concat includes_for_list_columns
     end
 
@@ -114,6 +119,7 @@ module ActiveScaffold::Actions
 
     def each_record_in_scope
       do_search if respond_to? :do_search, true
+      set_includes_for_columns
       append_to_query(beginning_of_chain, finder_options).all.each {|record| yield record}
     end
 

data/lib/active_scaffold/actions/subform.rb

@@ -2,7 +2,7 @@ module ActiveScaffold::Actions
   module Subform
     def edit_associated
       do_edit_associated
-      render :action => 'edit_associated', :formats => [:js]
+      render :action => 'edit_associated', :formats => [:js], :readonly => @column.association.options[:readonly]
     end
 
     protected
@@ -15,9 +15,7 @@ module ActiveScaffold::Actions
       # NOTE: we don't check whether the user is allowed to update this record, because if not, we'll still let them associate the record. we'll just refuse to do more than associate, is all.
       @record = @column.association.klass.find(params[:associated_id]) if params[:associated_id]
       @record ||= build_associated(@column, @parent_record)
-
-      @scope = "#{params[:scope]}[#{@column.name}]"
-      @scope += "[#{@record.id || generate_temporary_id(@record)}]" if @column.plural_association?
+      @scope = params[:scope]
     end
 
   end

data/lib/active_scaffold/attribute_params.rb

@@ -57,9 +57,7 @@ module ActiveScaffold
           parent_record.send(:assign_multiparameter_attributes, multi_parameter_attributes[column.name])
         elsif attributes.has_key? column.name
           value = column_value_from_param_value(parent_record, column, attributes[column.name]) 
-
-          # we avoid assigning a value that already exists because otherwise has_one associations will break (AR bug in has_one_association.rb#replace)
-          parent_record.send("#{column.name}=", value) unless parent_record.send(column.name) == value
+          parent_record.send("#{column.name}=", value)
         end
       end
 
@@ -93,7 +91,7 @@ module ActiveScaffold
     def column_value_from_param_value(parent_record, column, value)
       # convert the value, possibly by instantiating associated objects
       form_ui = column.form_ui || column.column.try(:type)
-      if form_ui && self.respond_to?("column_value_for_#{form_ui}_type")
+      if form_ui && self.respond_to?("column_value_for_#{form_ui}_type", true)
         self.send("column_value_for_#{form_ui}_type", parent_record, column, value)
       elsif value.is_a?(Hash)
         column_value_from_param_hash_value(parent_record, column, value)

data/lib/active_scaffold/bridges/calendar_date_select.rb

@@ -3,7 +3,7 @@ class ActiveScaffold::Bridges::CalendarDateSelect < ActiveScaffold::DataStructur
     # check to see if the old bridge was installed.  If so, warn them
     # we can detect this by checking to see if the bridge was installed before calling this code
        
-    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_calendar_date_select".send(::ActiveScaffold::METHOD_CONVERSION))
+    if ActiveScaffold::Config::Core.method_defined?(:initialize_with_calendar_date_select)
       raise RuntimeError, "We've detected that you have active_scaffold_calendar_date_select_bridge installed.  This plugin has been moved to core.  Please remove active_scaffold_calendar_date_select_bridge to prevent any conflicts"
     end
     

data/lib/active_scaffold/bridges/date_picker.rb

@@ -5,7 +5,10 @@ module ActiveScaffold::Bridges
       require File.join(File.dirname(__FILE__), "date_picker/ext.rb")
     end
     def self.install?
-      ActiveScaffold.js_framework == :jquery
+      ActiveScaffold.js_framework == :jquery && jquery_ui_included?
+    end
+    def self.jquery_ui_included?
+      Jquery::Rails.const_defined?('JQUERY_UI_VERSION') || Jquery.const_defined?('Ui')
     end
     def self.localization
       "jQuery(function($){

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

@@ -131,18 +131,18 @@ module ActiveScaffold::Bridges
         def to_datepicker_format(rails_format)
           ActiveScaffold::Bridges::DatePicker::Helper.to_datepicker_format(rails_format)
         end
-        
+
         def datepicker_format_options(column, format, options)
           if column.form_ui == :date_picker
             js_format = to_datepicker_format(I18n.translate!("date.formats.#{format}"))
-            options['date:dateFormat'] = js_format unless js_format.nil?
+            options['data-dateFormat'] = js_format unless js_format.nil?
           else
             rails_time_format = I18n.translate!("time.formats.#{format}")
             date_format, time_format = datepicker_split_datetime_format(self.to_datepicker_format(rails_time_format))
-            options['date:dateFormat'] = date_format unless date_format.nil?
+            options['data-dateFormat'] = date_format unless date_format.nil?
             unless time_format.nil?
-              options['time:timeFormat'] = time_format
-              options['time:ampm'] = true if rails_time_format.include?('%I')
+              options['data-timeFormat'] = time_format
+              options['data-ampm'] = true if rails_time_format.include?('%I')
             end
           end unless format == :default
         end
@@ -161,7 +161,7 @@ module ActiveScaffold::Bridges
           options[:style] = (options[:show].nil? || options[:show]) ? nil : "display: none"
           format = options.delete(:format) || (column.search_ui == :date_picker ? :default : :picker)
           datepicker_format_options(column, format, options)
-          text_field_tag("#{options[:name]}[#{name}]", value ? l(value, :format => format) : nil, options.merge(:id => "#{options[:id]}_#{name}", :name => "#{options[:name]}[#{name}]"))
+          text_field_tag("#{options[:name]}[#{name}]", value ? l(value, :format => format) : nil, options.merge(:id => "#{options[:id]}_#{name}", :name => "#{options[:name]}[#{name}]", :object => nil))
         end
       end
       

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".send(::ActiveScaffold::METHOD_CONVERSION))
+    if ActiveScaffold::Config::Core.method_defined?(:initialize_with_file_column)
       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/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".send(::ActiveScaffold::METHOD_CONVERSION))
+    alias_method_chain :initialize, :file_column unless self.method_defined?(:initialize_without_file_column)
     
     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

@@ -9,7 +9,7 @@ module ActiveScaffold
           
           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=".send(::ActiveScaffold::METHOD_CONVERSION))
+              klass.send :class_eval, <<-EOF, __FILE__, __LINE__ + 1  unless klass.method_defined?(:"#{field}_with_delete=")
                 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".send(::ActiveScaffold::METHOD_CONVERSION))
+    if ActiveScaffold::Config::Core.method_defined?(:initialize_with_paperclip)
       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/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}=".send(::ActiveScaffold::METHOD_CONVERSION))
+          klass.class_eval <<-EOF, __FILE__, __LINE__ + 1 unless klass.method_defined?(:"delete_#{field}=")
             attr_reader :delete_#{field}
 
             def delete_#{field}=(value)

data/lib/active_scaffold/bridges/shared/date_bridge.rb

@@ -57,7 +57,7 @@ module ActiveScaffold
           def active_scaffold_search_date_bridge_range_tag(column, options, current_search)
             range_controls = select_tag("search[#{column.name}][range]", 
               options_for_select( ActiveScaffold::Finder::DateRanges.collect{|range| [as_(range.downcase.to_sym), range]}, current_search["range"]), 
-             :class => 'text-input')
+             :class => 'text-input', :id => nil)
             content_tag("span", range_controls.html_safe, :id => "#{options[:id]}_range", :style => (current_search['opt'] == 'RANGE') ? nil : "display: none")
           end
           

data/lib/active_scaffold/config/base.rb

@@ -58,7 +58,12 @@ module ActiveScaffold::Config
 
       def []=(key, value)
         @session[@action] ||= {}
-        @session[@action][key] = value
+        if value
+          @session[@action][key] = value
+        else
+          @session[@action].delete key
+          @session.delete @action if @session[@action].empty?
+        end
       end
     end
     

data/lib/active_scaffold/config/core.rb

@@ -29,6 +29,14 @@ module ActiveScaffold::Config
     cattr_accessor :cache_action_link_urls
     @@cache_action_link_urls = true
 
+    # enable caching of association options
+    cattr_accessor :cache_association_options
+    @@cache_association_options = true
+
+    # enable saving user settings in session (per_page, limit, page, sort, search params)
+    cattr_accessor :store_user_settings
+    @@store_user_settings = true
+
     # lets you disable the DHTML history
     def self.dhtml_history=(val)
       @@dhtml_history = val
@@ -98,6 +106,12 @@ module ActiveScaffold::Config
     # enable caching of action link urls
     attr_accessor :cache_action_link_urls
 
+    # enable caching of association options
+    attr_accessor :cache_association_options
+
+    # enable saving user settings in session (per_page, limit, page, sort, search params)
+    attr_accessor :store_user_settings
+
     # lets you specify whether add a create link for each sti child for a specific controller
     attr_accessor :sti_create_links
     def add_sti_create_links?
@@ -147,6 +161,8 @@ module ActiveScaffold::Config
       @frontend = self.class.frontend
       @theme = self.class.theme
       @cache_action_link_urls = self.class.cache_action_link_urls
+      @cache_association_options = self.class.cache_association_options
+      @store_user_settings = self.class.store_user_settings
       @sti_create_links = self.class.sti_create_links
 
       # inherit from the global set of action links

data/lib/active_scaffold/config/list.rb

@@ -235,6 +235,10 @@ module ActiveScaffold::Config
         nested_default_sorting.nil? ? @conf.sorting : nested_default_sorting
       end
 
+      def user_sorting?
+        @params['sort'] && @params['sort_direction'] != 'reset'
+      end
+
       def sorting
         if @sorting.nil?
           # we want to store as little as possible in the session, but we want to return a Sorting data structure. so we recreate it each page load based on session data.

data/lib/active_scaffold/data_structures/column.rb

@@ -108,12 +108,19 @@ module ActiveScaffold::DataStructures
     # supported options:
     #   * for association columns
     #     * :select - displays a simple <select> or a collection of checkboxes to (dis)associate records
-    attr_writer :form_ui
+    def form_ui=(value)
+      self.list_method = nil if @list_ui.nil? && value != @form_ui
+      @form_ui = value
+    end
     def form_ui
       @form_ui
     end
 
-    attr_writer :list_ui
+    def list_ui=(value)
+      self.list_method = nil if value != @list_ui
+      @list_ui = value
+    end
+
     def list_ui
       @list_ui || @form_ui
     end
@@ -226,7 +233,7 @@ module ActiveScaffold::DataStructures
     attr_writer :show_blank_record
     def show_blank_record?(associated)
       if @show_blank_record
-        return false unless self.association.klass.authorized_for?(:crud_type => :create)
+        return false unless self.association.klass.authorized_for?(:crud_type => :create) and not self.association.options[:readonly]
         self.plural_association? or (self.singular_association? and associated.blank?)
       end
     end

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -66,7 +66,7 @@ module ActionView::Helpers #:nodoc:
         id = "as_#{eid}-embedded"
         url_options = {:controller => remote_controller.to_s, :action => 'index'}.merge(options[:params])
 
-        if controller.respond_to?(:render_component_into_view)
+        if controller.respond_to?(:render_component_into_view, true)
           controller.send(:render_component_into_view, url_options)
         else
           content_tag(:div, :id => id, :class => 'active-scaffold-component') do
@@ -93,7 +93,10 @@ module ActionView::Helpers #:nodoc:
 
         options = args[1] || {}
         options[:locals] ||= {}
-        options[:locals] = view_stack.last[:locals].merge!(options[:locals]) if view_stack.last && view_stack.last[:locals]
+        if view_stack.last
+          options[:locals] = view_stack.last[:locals].merge!(options[:locals]) if view_stack.last[:locals]
+          options[:object] ||= view_stack.last[:object] if view_stack.last[:object]
+        end
         options[:template] = template
         # if prefix is active_scaffold_overrides we must try to render with this prefix in following paths
         if prefix != 'active_scaffold_overrides'
@@ -109,10 +112,12 @@ module ActionView::Helpers #:nodoc:
       else
         @_view_paths ||= lookup_context.view_paths.clone
         last_template = lookup_context.last_template
-        if args.first.is_a?(Hash)
-          current_view = {:locals => args.first[:locals]}
-          view_stack << current_view
+        if args[0].is_a?(Hash)
+          current_view = {:locals => args[0][:locals], :object => args[0][:object]}
+        else # call is render 'partial', locals_hash
+          current_view = {:locals => args[1]}
         end
+        view_stack << current_view if current_view
         lookup_context.view_paths = @_view_paths # reset view_paths in case a view render :super, and then render :partial
         result = render_without_active_scaffold(*args, &block)
         view_stack.pop if current_view.present?

data/lib/active_scaffold/helpers/association_helpers.rb

@@ -1,6 +1,17 @@
 module ActiveScaffold
   module Helpers
     module AssociationHelpers
+      # Cache the optins for select
+      def cache_association_options(association, conditions, klass, cache = true)
+        if active_scaffold_config.cache_association_options && cache
+          @_associations_cache ||= Hash.new { |h,k| h[k] = {} }
+          key = [association.name, association.active_record.name, klass.name].join('/')
+          @_associations_cache[key][conditions] ||= yield
+        else
+          yield
+        end
+      end
+
       # Provides a way to honor the :conditions on an association while searching the association's klass
       def association_options_find(association, conditions = nil, klass = nil)
         if klass.nil? && association.options[:polymorphic]
@@ -10,18 +21,22 @@ module ActiveScaffold
           else
             return []
           end
+          cache = !block_given?
         else
+          cache = !block_given? && klass.nil?
           klass ||= association.klass
         end
 
         conditions = options_for_association_conditions(association) if conditions.nil?
-        relation = klass.where(conditions).where(association.options[:conditions])
-        relation = relation.includes(association.options[:include]) if association.options[:include]
-        relation = yield(relation) if block_given?
-        relation.all
+        cache_association_options(association, conditions, klass, cache) do
+          relation = klass.where(conditions).where(association.options[:conditions])
+          relation = relation.includes(association.options[:include]) if association.options[:include]
+          relation = yield(relation) if block_given?
+          relation.to_a
+        end
       end
 
-      # Provides a way to honor the :conditions on an association while searching the association's klass
+      # Sorts the options for select
       def sorted_association_options_find(association, conditions = nil)
         association_options_find(association, conditions).sort_by(&:to_label)
       end

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -46,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((options[:object] || @raecord).send(column.name), column.options) if column.number?
+                options[:value] = format_number_value((options[:object] || @record).send(column.name), column.options) if column.number?
                 text_field(:record, column.name, options.merge(column.options))
               end
             end
@@ -57,7 +57,9 @@ module ActiveScaffold
         end
       end
       
-      def active_scaffold_render_subform_column(column, scope, crud_type, readonly, add_class = false)
+      def active_scaffold_render_subform_column(column, scope, crud_type, readonly, add_class = false, record = nil)
+        Rails.logger.warn "Relying on @record is deprecated, call active_scaffold_render_subform_column with record. Called from #{caller.first.gsub(/(.*:\d+):.*/, '\1')}" if record.nil? # TODO Remove when relying on @record is removed
+        record ||= @record # TODO Remove when relying on @record is removed
         if add_class
           col_class = []
           col_class << 'required' if column.required?
@@ -66,12 +68,12 @@ module ActiveScaffold
           col_class << 'checkbox' if column.form_ui == :checkbox
           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_column(column, @record, column_renders_as(column), scope, false, col_class)
+        unless readonly and not record.new_record? or not record.authorized_for?(:crud_type => crud_type, :column => column.name)
+          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
-          content_tag :span, get_column_value(@record, column), options
+          content_tag :span, get_column_value(record, column), options
         end
       end
 
@@ -103,14 +105,17 @@ module ActiveScaffold
       end
 
       def update_columns_options(column, scope, options)
+        record = options[:object]
+        Rails.logger.warn "Relying on @record is deprecated, call update_columns_options with record. Called from #{caller.first.gsub(/(.*:\d+):.*/, '\1')}" if record.nil? # TODO Remove when relying on @record is removed
+        record ||= @record # TODO Remove when relying on @record is removed
         form_action = if scope
-          subform_controller = controller.class.active_scaffold_controller_for(@record.class)
+          subform_controller = controller.class.active_scaffold_controller_for(record.class)
           subform_controller.active_scaffold_config.subform
         elsif [:new, :create, :edit, :update, :render_field].include? params[:action].to_sym
-          active_scaffold_config.send(@record.new_record? ? :create : :update)
+          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 = params_for(:action => 'render_field', :column => column.name, :id => @record.id)
+          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
@@ -133,34 +138,38 @@ module ActiveScaffold
       
       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 }
+          render :partial => override_form_field_partial(column), :locals => { :column => column, :only_value => only_value, :scope => scope, :col_class => col_class, :record => record }
         elsif renders_as == :field || override_form_field?(column)
-          form_attribute(column, record, scope, only_value)
+          form_attribute(column, record, scope, only_value, col_class)
         elsif renders_as == :subform
-          render :partial => 'form_association', :locals => { :column => column, :scope => scope }
+          render :partial => 'form_association', :locals => { :column => column, :scope => scope, :parent_record => record }
         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)
+        column_options = active_scaffold_input_options(column, scope, :object => record)
         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)
+          active_scaffold_input_for column, scope, column_options
         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))
+          content_tag(:span, get_column_value(record, column), column_options.except(:name, :object)) <<
+          hidden_field(:record, column.association ? column.association.foreign_key : column.name, column_options)
         end
         
         content_tag :dl, attributes do
-          %|<dt>#{label_tag column_options[:id], column.label}</dt><dd>#{field}
+          %|<dt>#{label_tag label_for(column, column_options), 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 label_for(column, options)
+        options[:id] unless column.form_ui == :select && column.plural_association?
+      end
       
       def form_hidden_attribute(column, record, scope = nil)
         %|<dl style="display: none;"><dt></dt><dd>
@@ -219,7 +228,7 @@ module ActiveScaffold
       end
       
       def active_scaffold_checkbox_list(column, select_options, associated_ids, options)
-        html = hidden_field_tag("#{options[:name]}[]", '')
+        html = hidden_field_tag("#{options[:name]}[]", '', :id => nil)
         html << content_tag(:ul, :class => "#{options[:class]} checkbox-list", :id => options[:id]) do
           content = ''.html_safe
           select_options.each_with_index do |option, i|
@@ -403,16 +412,17 @@ module ActiveScaffold
         end
       end
 
-      def column_scope(column, scope = nil)
+      def column_scope(column, scope = nil, record = nil)
+        Rails.logger.warn "Relying on @record is deprecated, call column_scope with record. Called from #{caller.first.gsub(/(.*:\d+):.*/, '\1')}" if record.nil? # TODO Remove when relying on @record is removed
         if column.plural_association?
-          "#{scope}[#{column.name}][#{@record.id || generate_temporary_id}]"
+          "#{scope}[#{column.name}][#{record.id || generate_temporary_id}]"
         else
           "#{scope}[#{column.name}]"
         end
       end
 
       def active_scaffold_add_existing_input(options)
-        if ActiveScaffold.js_framework == :prototype && controller.respond_to?(:record_select_config)
+        if ActiveScaffold.js_framework == :prototype && controller.respond_to?(:record_select_config, true)
           remote_controller = active_scaffold_controller_for(record_select_config.model).controller_path
           options.merge!(:controller => remote_controller)
           options.merge!(active_scaffold_input_text_options)
@@ -426,7 +436,7 @@ module ActiveScaffold
       end
 
       def active_scaffold_add_existing_label
-        if controller.respond_to?(:record_select_config)
+        if controller.respond_to?(:record_select_config, true)
           record_select_config.model.model_name.human
         else
           active_scaffold_config.model.model_name.human