active_scaffold 3.3.3 → 3.4.0

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -10,7 +10,7 @@ module ActiveScaffold
           value = ' '.html_safe if value.nil? or value.blank? # fix for IE 6
           return value
         rescue Exception => e
-          logger.error "#{Time.now.to_s} #{e.inspect} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
+          logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}, record: #{record.inspect}"
           raise e
         end
       end
@@ -41,16 +41,21 @@ module ActiveScaffold
       # TODO: move empty_field_text and   logic in here?
       # TODO: we need to distinguish between the automatic links *we* create and the ones that the dev specified. some logic may not apply if the dev specified the link.
       def render_list_column(text, column, record)
-        if column.link && !skip_action_link?(column.link, record)
-          link = column.link
-          associated = record.send(column.association.name) if column.association
-          render_action_link(link, record, :link => text, :authorized => link.action.nil? || column_link_authorized?(link, column, record, associated))
-        elsif inplace_edit?(record, column)
-          active_scaffold_inplace_edit(record, column, {:formatted_column => text})
-        elsif active_scaffold_config.list.wrap_tag
-          content_tag active_scaffold_config.list.wrap_tag, text
-        else
-          text
+        begin
+          if column.link && !skip_action_link?(column.link, record)
+            link = column.link
+            associated = record.send(column.association.name) if column.association
+            render_action_link(link, record, :link => text, :authorized => link.action.nil? || column_link_authorized?(link, column, record, associated))
+          elsif inplace_edit?(record, column)
+            active_scaffold_inplace_edit(record, column, {:formatted_column => text})
+          elsif active_scaffold_config.list.wrap_tag
+            content_tag active_scaffold_config.list.wrap_tag, text
+          else
+            text
+          end
+        rescue Exception => e
+          logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
+          raise e
         end
       end
 
@@ -78,7 +83,7 @@ module ActiveScaffold
 
       def active_scaffold_column_marked(record, column)
         options = {:id => nil, :object => record}
-        content_tag(:span, check_box(:record, column.name, options), :class => 'in_place_editor_field', :data => {:ie_id => record.id.to_s})
+        content_tag(:span, check_box(:record, column.name, options), :class => 'in_place_editor_field', :data => {:ie_id => record.to_param})
       end
 
       def active_scaffold_column_checkbox(record, column)
@@ -106,11 +111,7 @@ module ActiveScaffold
       ##
       def format_column_value(record, column, value = nil)
         value ||= record.send(column.name) unless record.nil?
-        if value && column.association # cache association size before calling column_empty?
-          associated_size = value.size if column.plural_association? and column.associated_number? # get count before cache association
-          cache_association(value, column, associated_size) if column.plural_association?
-        end
-        if column.association.nil? or column_empty?(value)
+        if column.association.nil?
           if column.form_ui == :select && column.options[:options]
             text, val = column.options[:options].find {|text, val| (val.nil? ? text : val).to_s == value.to_s}
             value = active_scaffold_translated_option(column, text, val).first if text
@@ -121,6 +122,10 @@ module ActiveScaffold
             format_value(value, column.options)
           end
         else
+          if column.plural_association?
+            associated_size = value.size if column.associated_number? # get count before cache association
+            cache_association(record.association(column.name), column, associated_size) unless value.loaded?
+          end
           format_association_value(value, column, associated_size)
         end
       end
@@ -142,29 +147,30 @@ module ActiveScaffold
       end
 
       def format_association_value(value, column, size)
-        format_value case column.association.macro
-          when :has_one, :belongs_to
-            if column.polymorphic_association?
-              "#{value.class.model_name.human}: #{value.to_label}"
-            else
-              value.to_label
-            end
-          when :has_many, :has_and_belongs_to_many
-            if column.associated_limit.nil?
-              firsts = value.collect { |v| v.to_label }
-            else
-              firsts = value.first(column.associated_limit)
-              firsts.collect! { |v| v.to_label }
-              firsts[column.associated_limit] = '…' if value.size > column.associated_limit
-            end
-            if column.associated_limit == 0
-              size if column.associated_number?
-            else
-              joined_associated = firsts.join(h(active_scaffold_config.list.association_join_text)).html_safe
-              joined_associated << " (#{size})" if column.associated_number? and column.associated_limit and value.size > column.associated_limit
-              joined_associated
-            end
+        method = column.options[:label_method] || :to_label
+        value = if column.association.collection?
+          if column.associated_limit.nil?
+            firsts = value.collect(&method)
+          else
+            firsts = value.first(column.associated_limit)
+            firsts.collect!(&method)
+            firsts[column.associated_limit] = '…' if value.size > column.associated_limit
+          end
+          if column.associated_limit == 0
+            size if column.associated_number?
+          else
+            joined_associated = firsts.join(h(active_scaffold_config.list.association_join_text)).html_safe
+            joined_associated << " (#{size})" if column.associated_number? and column.associated_limit and value.size > column.associated_limit
+            joined_associated
+          end
+        elsif value
+          if column.polymorphic_association?
+            "#{value.class.model_name.human}: #{value.send(method)}"
+          else
+            value.send(method)
+          end
         end
+        format_value value
       end
 
       def format_value(column_value, options = {})
@@ -180,17 +186,15 @@ module ActiveScaffold
         clean_column_value(value)
       end
 
-      def cache_association(value, column, size)
-        # we are not using eager loading, cache firsts records in order not to query the database in a future
-        unless value.loaded?
-          # load at least one record, is needed to display '...'
-          if column.associated_limit.nil?
-            Rails.logger.warn "ActiveScaffold: Enable eager loading for #{column.name} association to reduce SQL queries"
-          elsif column.associated_limit > 0
-            value.target = value.find(:all, :limit => column.associated_limit + 1, :select => column.select_associated_columns)
-          elsif @cache_associations
-            value.target = size.to_i.zero? ? [] : [nil]
-          end
+      def cache_association(association, column, size)
+        # we are not using eager loading, cache firsts records in order not to query the database for whole association in a future
+        if column.associated_limit.nil?
+          logger.warn "ActiveScaffold: Enable eager loading for #{column.name} association to reduce SQL queries"
+        elsif column.associated_limit > 0
+          # load at least one record more, is needed to display '...'
+          association.target = association.reader.limit(column.associated_limit + 1).select(column.select_associated_columns || '*').to_a
+        elsif @cache_associations
+          association.target = []
         end
       end
 
@@ -209,15 +213,18 @@ module ActiveScaffold
          column.inplace_edit != :ajax and (override_form_field?(column) or column.form_ui or (column.column and override_input?(column.column.type)))
       end
 
-      def active_scaffold_inplace_edit(record, column, options = {})
-        formatted_column = options[:formatted_column] || format_column_value(record, column)
+      def active_scaffold_inplace_edit_tag_options(record, column)
         id_options = {:id => record.id.to_s, :action => 'update_column', :name => column.name.to_s}
         tag_options = {:id => element_cell_id(id_options), :class => "in_place_editor_field",
-                       :title => as_(:click_to_edit), :data => {:ie_id => record.id.to_s}}
+                       :title => as_(:click_to_edit), :data => {:ie_id => record.to_param}}
         tag_options[:data][:ie_update] = column.inplace_edit if column.inplace_edit != true
+        tag_options
+      end
 
+      def active_scaffold_inplace_edit(record, column, options = {})
+        formatted_column = options[:formatted_column] || format_column_value(record, column)
         content_tag(:span, as_(:inplace_edit_handle), :class => 'handle') <<
-        content_tag(:span, formatted_column, tag_options)
+        content_tag(:span, formatted_column, active_scaffold_inplace_edit_tag_options(record, column))
       end
 
       def inplace_edit_control(column)
@@ -228,8 +235,10 @@ module ActiveScaffold
           column.form_ui = :select if (column.association && column.form_ui.nil?)
           options = active_scaffold_input_options(column).merge(:object => new_model)
           options[:class] = "#{options[:class]} inplace_field"
+          options[:"data-id"] = options[:id]
+          options[:id] = nil
           content_tag(:div, active_scaffold_input_for(column, nil, options), :style => "display:none;", :class => inplace_edit_control_css_class).tap do
-            @record = old_record
+            @record = old_record # TODO remove when relying on @record is removed
           end
         end
       end
@@ -280,7 +289,7 @@ module ActiveScaffold
       end
 
       def column_heading_attributes(column, sorting, sort_direction)
-        tag_options = {:id => active_scaffold_column_header_id(column), :class => column_heading_class(column, sorting), :title => strip_tags(column.description)}
+        tag_options = {:id => active_scaffold_column_header_id(column), :class => column_heading_class(column, sorting), :title => strip_tags(column.description).presence}
       end
 
       def render_column_heading(column, sorting, sort_direction)

data/lib/active_scaffold/helpers/pagination_helpers.rb

@@ -5,7 +5,8 @@ module ActiveScaffold
         link_to page_number, url_options.merge(:page => page_number), options.merge(:class => "as_paginate")
       end
 
-      def pagination_ajax_links(current_page, url_options, options, inner_window, outer_window)
+      def pagination_url_options(url_options = nil)
+        url_options ||= params_for(:action => :index)
         unless active_scaffold_config.store_user_settings
           url_options.merge!(:search => search_params) if search_params.present?
           if active_scaffold_config.list.user.user_sorting?
@@ -13,7 +14,10 @@ module ActiveScaffold
             url_options.merge!(:sort => column.name, :sort_direction => direction)
           end
         end
+        url_options
+      end
 
+      def pagination_ajax_links(current_page, url_options, options, inner_window, outer_window)
         start_number = current_page.number - inner_window
         end_number = current_page.number + inner_window
         start_number = 1 if start_number <= 0

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -6,10 +6,13 @@ module ActiveScaffold
       # It does not do any rendering. It only decides which method is responsible for rendering.
       def active_scaffold_search_for(column, options = nil)
         options ||= active_scaffold_search_options(column)
+        record = options[:object]
+        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
+        record ||= @record # TODO Remove when relying on @record is removed
 
         # first, check if the dev has created an override for this specific field for search
         if (method = override_search_field(column))
-          send(method, options[:object] || @record, options)
+          send(method, record, options)
 
         # second, check if the dev has specified a valid search_ui for this column, using specific ui for searches
         elsif column.search_ui and (method = override_search(column.search_ui))
@@ -21,7 +24,7 @@ module ActiveScaffold
 
         # fourth, check if the dev has created an override for this specific field
         elsif (method = override_form_field(column))
-          send(method, options[:object] || @record, options)
+          send(method, record, options)
 
         # fallback: we get to make the decision
         else
@@ -44,6 +47,9 @@ module ActiveScaffold
             end
           end
         end
+      rescue Exception => e
+        logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
+        raise e
       end
 
       # the standard active scaffold options used for class, name and scope
@@ -66,12 +72,16 @@ module ActiveScaffold
       ##
 
       def active_scaffold_search_multi_select(column, options)
+        record = options.delete(:object)
+        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
+        record ||= @record # TODO Remove when relying on @record is removed
         associated = options.delete :value
         associated = [associated].compact unless associated.is_a? Array
         associated.collect!(&:to_i)
         
         if column.association
-          select_options = sorted_association_options_find(column.association).collect {|r| [r.to_label, r.id]}
+          method = column.options[:label_method] || :to_label
+          select_options = sorted_association_options_find(column.association, nil, record).collect {|r| [r.send(method), r.id]}
         else
           select_options = column.options[:options].collect do |text, value|
             active_scaffold_translated_option(column, text, value)
@@ -83,11 +93,14 @@ module ActiveScaffold
       end
 
       def active_scaffold_search_select(column, html_options, options = {})
+        record = html_options.delete(:object)
+        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in html_options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
+        record ||= @record # TODO Remove when relying on @record is removed
         associated = html_options.delete :value
         if column.association
           associated = associated.is_a?(Array) ? associated.map(&:to_i) : associated.to_i unless associated.nil?
           method = column.association.macro == :belongs_to ? column.association.foreign_key : column.name
-          select_options = sorted_association_options_find(column.association, false)
+          select_options = sorted_association_options_find(column.association, false, record)
         else
           method = column.name
           select_options = column.options[:options].collect do |text, value|
@@ -106,7 +119,7 @@ module ActiveScaffold
         if optgroup = options.delete(:optgroup)
           select(:record, method, active_scaffold_grouped_options(column, select_options, optgroup), options, html_options)
         elsif column.association
-          collection_select(:record, method, select_options, :id, :to_label, options, html_options)
+          collection_select(:record, method, select_options, :id, column.options[:label_method] || :to_label, options, html_options)
         else
           select(:record, method, select_options, options, html_options)
         end
@@ -124,7 +137,7 @@ module ActiveScaffold
         select_options << [as_(:true), true]
         select_options << [as_(:false), false]
 
-        select_tag(options[:name], options_for_select(select_options, column.column.type_cast(field_search_params[column.name])), :id => options[:id])
+        select_tag(options[:name], options_for_select(select_options, column.column.type_cast(options[:value])), :id => options[:id])
       end
       # we can't use checkbox ui because it's not possible to decide whether search for this field or not
       alias_method :active_scaffold_search_checkbox, :active_scaffold_search_boolean
@@ -133,29 +146,19 @@ module ActiveScaffold
         select_options = []
         select_options << [as_(:_select_), nil]
         select_options.concat ActiveScaffold::Finder::NullComparators.collect {|comp| [as_(comp), comp]}
-        select_tag(options[:name], options_for_select(select_options, field_search_params[column.name]), :id => options[:id])
+        select_tag(options[:name], options_for_select(select_options, options[:value]), :id => options[:id])
       end
 
       def field_search_params_range_values(column)
         values = field_search_params[column.name]
-        return nil if values.nil?
+        return nil unless values.is_a? Hash
         return values[:opt], (values[:from].blank? ? nil : values[:from]), (values[:to].blank? ? nil : values[:to])
-        
       end
 
       def active_scaffold_search_range_string?(column)
         (column.column && column.column.text?) || column.search_ui == :string
       end
 
-      def include_null_comparators?(column)
-        return column.options[:null_comparators] if column.options.has_key? :null_comparators
-        if column.association
-          column.association.macro != :belongs_to || active_scaffold_config.columns[column.association.foreign_key].column.try(:null)
-        else
-          column.column.try(:null)
-        end
-      end
-
       def active_scaffold_search_range_comparator_options(column)
         select_options = ActiveScaffold::Finder::NumericComparators.collect {|comp| [as_(comp.downcase.to_sym), comp]}
         if active_scaffold_search_range_string?(column)

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -59,19 +59,6 @@ module ActiveScaffold
         end
       end
 
-      # Should this column be displayed in the subform?
-      def in_subform?(column, parent_record)
-        return true unless column.association
-
-        # Polymorphic associations can't appear because they *might* be the reverse association, and because you generally don't assign an association from the polymorphic side ... I think.
-        return false if column.polymorphic_association?
-
-        # A column shouldn't be in the subform if it's the reverse association to the parent
-        return false if column.association.inverse_for?(parent_record.class)
-
-        return true
-      end
-
       def form_remote_upload_tag(url_for_options = {}, options = {})
         options[:target] = action_iframe_id(url_for_options)
         options[:multipart] ||= true
@@ -91,8 +78,8 @@ module ActiveScaffold
       # You may also flag whether the other element is visible by default or not, and the initial text will adjust accordingly.
       def link_to_visibility_toggle(id, options = {})
         options[:default_visible] = true if options[:default_visible].nil?
-        options[:hide_label] = as_(:hide) 
-        options[:show_label] = as_(:show)
+        options[:hide_label] ||= as_(:hide) 
+        options[:show_label] ||= as_(:show_block)
         javascript_tag("ActiveScaffold.create_visibility_toggle('#{id}', #{options.to_json});")
       end
 
@@ -148,7 +135,7 @@ module ActiveScaffold
             group_tag = :li
           end
           content = content_tag(group_tag, :class => (html_classes if html_classes.present?), :onclick => ('' if hover_via_click?)) do
-            content_tag(:div, as_(link.name), :class => link.name.to_s.downcase) << content_tag(:ul, content)
+            content_tag(:div, as_(link.label), :class => link.name.to_s.downcase) << content_tag(:ul, content)
           end
         else
           content = render_action_link(link, record, options)
@@ -229,42 +216,61 @@ module ActiveScaffold
         end
       end
 
-      def action_link_url(link, record)
-        url = (@action_links_urls ||= {})[link.name_to_cache_link_url]
+      def is_sti_record?(record)
+        model = active_scaffold_config.model
+        is_sti_record = record && model.columns_hash.include?(model.inheritance_column) &&
+          record[model.inheritance_column].present? && !record.instance_of?(model)
+      end
+
+      def cache_action_link_url?(link, record)
+        active_scaffold_config.cache_action_link_urls && link.type == :member && !link.dynamic_parameters.is_a?(Proc) && !is_sti_record?(record)
+      end
+
+      def cached_action_link_url(link, record)
+        url = (@action_links_urls ||= {})[link.name_to_cache]
         url ||= begin
           url_options = action_link_url_options(link, record)
-          if active_scaffold_config.cache_action_link_urls
-            url = url_for(url_options)
-            model = active_scaffold_config.model
-            is_sti_record = record && model.columns_hash.include?(model.inheritance_column) &&
-              record[model.inheritance_column].present?
-            unless link.dynamic_parameters.is_a?(Proc) || is_sti_record
-              @action_links_urls[link.name_to_cache_link_url] = url 
-            end
-            url
+          if cache_action_link_url?(link, record)
+            @action_links_urls[link.name_to_cache] = url_for(url_options)
           else
             url_for(params_for(url_options))
           end
         end
-        
-        url = record ? url.sub('--ID--', record.id.to_s) : url.clone
+      end
+      
+      def replace_id_params_in_action_link_url(link, record, url)
+        url = record ? url.sub('--ID--', record.to_param) : url.clone
         if link.column.try(:singular_association?)
-          url = url.sub('--CHILD_ID--', record.send(link.column.association.name).try(:id).to_s) 
+          child_id = record.send(link.column.association.name).try(:to_param)
+          if child_id.present?
+            url.sub!('--CHILD_ID--', child_id)
+          else
+            url.sub!(/\w+=--CHILD_ID--&?/,'')
+            url.sub!(/\?$/, '')
+          end
         elsif nested?
-          url = url.sub('--CHILD_ID--', params[nested.param_name].to_s)
+          url.sub!('--CHILD_ID--', params[nested.param_name].to_s)
         end
-
-        if active_scaffold_config.cache_action_link_urls
-          query_string, non_nested_query_string = query_string_for_action_links(link)
-          if query_string || (!link.nested_link? && non_nested_query_string)
-            url << (url.include?('?') ? '&' : '?')
-            url << query_string if query_string
-            url << non_nested_query_string if !link.nested_link? && non_nested_query_string
-          end
+        url
+      end
+      
+      def add_query_string_to_cached_url(link, url)
+        query_string, non_nested_query_string = query_string_for_action_links(link)
+        nested_params = (!link.nested_link? && non_nested_query_string)
+        if query_string || nested_params
+          url << (url.include?('?') ? '&' : '?')
+          url << query_string if query_string
+          url << non_nested_query_string if nested_params
         end
         url
       end
 
+      def action_link_url(link, record)
+        url = replace_id_params_in_action_link_url(link, record, cached_action_link_url(link, record))
+        url = add_query_string_to_cached_url(link, url) if @action_links_urls[link.name_to_cache]
+        url
+      end
+
       def query_string_for_action_links(link)
         if defined?(@query_string) && link.parameters.none? { |k, v| @query_string_params.include? k }
           return [@query_string, @non_nested_query_string]
@@ -272,8 +278,8 @@ module ActiveScaffold
         keep = true
         @query_string_params ||= Set.new
         query_string_for_all = nil
-        query_string_options = []
-        non_nested_query_string_options = []
+        query_string_options = {}
+        non_nested_query_string_options = {}
         
         params_for.except(:controller, :action, :id).each do |key, value|
           @query_string_params << key
@@ -281,17 +287,16 @@ module ActiveScaffold
             keep = false
             next
           end
-          qs = "#{key}=#{value}"
           if NESTED_PARAMS.include?(key) || conditions_from_params.include?(key) || (nested? && nested.param_name == key)
-            non_nested_query_string_options << qs
+            non_nested_query_string_options[key] = value
           else
-            query_string_options << qs
+            query_string_options[key] = value
           end
         end
         
-        query_string = URI.escape(query_string_options.join('&')) if query_string_options.present?
+        query_string = query_string_options.to_query if query_string_options.present?
         if non_nested_query_string_options.present?
-          non_nested_query_string = "#{'&' if query_string}#{URI.escape(non_nested_query_string_options.join('&'))}"
+          non_nested_query_string = "#{'&' if query_string}#{non_nested_query_string_options.to_query}"
         end
         if keep
           @query_string = query_string
@@ -299,8 +304,23 @@ module ActiveScaffold
         end
         [query_string, non_nested_query_string]
       end
+
+      def cache_action_link_url_options?(link, record)
+        active_scaffold_config.cache_action_link_urls && (link.type == :collection || !link.dynamic_parameters.is_a?(Proc)) && !is_sti_record?(record)
+      end
       
       def action_link_url_options(link, record)
+        options = (@action_links_url_options ||= {})[link.name_to_cache]
+        options ||= begin
+          options = generate_action_link_url_options(link, record)
+          if cache_action_link_url_options?(link, record)
+            @action_links_url_options[link.name_to_cache] = options
+          end
+          options
+        end
+      end
+
+      def generate_action_link_url_options(link, record)
         url_options = {:action => link.action}
         url_options[:id] = '--ID--' unless record.nil?
         url_options[:controller] = link.controller.to_s if link.controller
@@ -327,6 +347,28 @@ module ActiveScaffold
         text || options[:link]
       end
       
+      def replaced_action_link_url_options(link, record)
+        url = action_link_url_options(link, record)
+        url[:controller] ||= params[:controller]
+        missing_options, url_options = url.partition{|k,v| v.nil?}
+        replacements = {}
+        replacements['--ID--'] = record.id.to_s if record
+        if link.column.try(:singular_association?)
+          replacements['--CHILD_ID--'] = record.send(link.column.association.name).try(:id).to_s
+        elsif nested?
+          replacements['--CHILD_ID--'] = params[nested.param_name].to_s
+        end
+        url_options.collect! do |k,v|
+          [k.to_s, replacements[v] || v]
+        end
+        [missing_options, url_options]
+      end
+      
+      def action_link_selected?(link, record)
+        missing_options, url_options = replaced_action_link_url_options(link, record)
+        (url_options - params.to_a).blank? && missing_options.all? {|k,v| params[k].nil?}
+      end
+      
       def action_link_html_options(link, record, options)
         link_id = get_action_link_id(link, record)
         html_options = link.html_options.merge(:class => [link.html_options[:class], link.action.to_s].compact.join(' '))
@@ -344,6 +386,12 @@ module ActiveScaffold
           html_options[:data][:cancel_refresh] = true if link.refresh_on_close
           html_options[:data][:keep_open] = true if link.keep_open?
         end
+
+        if link.toggle
+          html_options[:class] << ' toggle'
+          html_options[:class] << ' active' if action_link_selected?(link, record)
+        end
+        
         html_options[:target] = '_blank' if link.popup?
         html_options[:id] = link_id
         html_options[:remote] = true unless link.page? || link.popup?
@@ -360,7 +408,6 @@ module ActiveScaffold
 
       def get_action_link_id(link, record = nil, column = nil)
         column ||= link.column
-        id = record ? record.id.to_s : (nested? ? nested.parent_id : '')
         if column && column.plural_association?
           id = "#{column.association.name}-#{record.id}"
         elsif column && column.singular_association?
@@ -370,6 +417,7 @@ module ActiveScaffold
             id = "#{column.association.name}-#{record.id}" unless record.nil?
           end
         end
+        id ||= record ? record.id : (nested? ? nested_parent_id : '')
         action_id = "#{id_from_controller("#{link.controller}-") if params[:parent_controller] || (link.controller && link.controller != controller.controller_path)}#{link.action}"
         action_link_id(action_id, id)
       end
@@ -416,7 +464,7 @@ module ActiveScaffold
 
       def list_row_class_method(record)
         return @_list_row_class_method if defined? @_list_row_class_method
-        class_override_helper = :"#{clean_class_name(record.class.name)}_list_row_class"
+        class_override_helper = "#{clean_class_name(record.class.name)}_list_row_class"
         @_list_row_class_method = (class_override_helper if respond_to?(class_override_helper))
       end
 
@@ -487,16 +535,6 @@ module ActiveScaffold
       def format_column_calculation(column, calculation)
         "#{"#{as_(column.calculate)}: " unless column.calculate.is_a? Proc}#{format_column_value nil, column, calculation}"
       end
-
-      def column_show_add_existing(column)
-        (column.allow_add_existing and options_for_association_count(column.association) > 0)
-      end
-
-      def column_show_add_new(column, associated, record)
-        value = (column.plural_association? && !column.readonly_association?) || (column.singular_association? and not associated.empty?)
-        value = false unless column.association.klass.authorized_for?(:crud_type => :create)
-        value
-      end
  
       def clean_column_name(name)
         name.to_s.gsub('?', '')
@@ -512,11 +550,11 @@ module ActiveScaffold
       end
 
       def override_helper(column, suffix)
-        @_override_helpers ||= {}
-        @_override_helpers[suffix] ||= {}
-        @_override_helpers[suffix][@record.class.name] ||= {}
-        return @_override_helpers[suffix][@record.class.name][column.name] if @_override_helpers[suffix][@record.class.name].include? column.name
-        @_override_helpers[suffix][@record.class.name][column.name] = begin
+        hash = @_override_helpers ||= {}
+        hash = hash[suffix] ||= {}
+        hash = hash[column.active_record_class.name] ||= {}
+        return hash[column.name] if hash.include? column.name
+        hash[column.name] = begin
           method_with_class = override_helper_name(column, suffix, true)
           if respond_to?(method_with_class)
             method_with_class
@@ -530,7 +568,7 @@ module ActiveScaffold
       def display_message(message)
         if (highlights = active_scaffold_config.highlight_messages)
           message = highlights.inject(message) do |msg, (phrases, highlighter)|
-            highlight(msg, phrases, highlighter)
+            highlight(msg, phrases, highlighter || {})
           end
         end
         if (format = active_scaffold_config.timestamped_messages)