active_scaffold 3.3.3 → 3.4.0

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

@@ -29,23 +29,22 @@ module ActiveScaffold
             active_scaffold_search_date_bridge_calendar_control(column, options, current_search, 'from') <<
             content_tag(:span, (" - " + active_scaffold_search_date_bridge_calendar_control(column, options, current_search, 'to')).html_safe,
               :id => "#{options[:id]}_between", :class => "as_search_range_between", :style => current_search['opt'] == 'BETWEEN' ? nil : "display: none")
-            content_tag("span", numeric_controls.html_safe, :id => "#{options[:id]}_numeric", :style => ActiveScaffold::Finder::NumericComparators.include?(current_search['opt']) ? nil : "display: none")
+            content_tag("span", numeric_controls.html_safe, :id => "#{options[:id]}_numeric", :class => "search-date-numeric", :style => ActiveScaffold::Finder::NumericComparators.include?(current_search['opt']) ? nil : "display: none")
           end
   
           def active_scaffold_search_date_bridge_trend_tag(column, options, current_search)
             active_scaffold_date_bridge_trend_tag(column, options, 
-                                                 {:name_prefix => 'search',
-                                                  :number_value => current_search['number'],
+                                                 {:number_value => current_search['number'],
                                                   :unit_value => current_search["unit"],
                                                   :show => (current_search['opt'] == 'PAST' || current_search['opt'] == 'FUTURE')})
           end
 
           def active_scaffold_date_bridge_trend_tag(column, options, trend_options)
-            trend_controls = text_field_tag("#{trend_options[:name_prefix]}[#{column.name}][number]", trend_options[:number_value], :class => 'text-input', :size => 10, :autocomplete => 'off') << " " <<
-            select_tag("#{trend_options[:name_prefix]}[#{column.name}][unit]",
+            trend_controls = text_field_tag("#{options[:name]}[number]", trend_options[:number_value], :class => 'text-input', :size => 10, :autocomplete => 'off') << " " <<
+            select_tag("#{options[:name]}[unit]",
              options_for_select(active_scaffold_search_date_bridge_trend_units(column), trend_options[:unit_value]),
              :class => 'text-input')
-            content_tag("span", trend_controls.html_safe, :id => "#{options[:id]}_trend", :style => trend_options[:show] ? nil : "display: none")
+            content_tag("span", trend_controls.html_safe, :id => "#{options[:id]}_trend", :class => "search-date-trend", :style => trend_options[:show] ? nil : "display: none")
           end
 
           def active_scaffold_search_date_bridge_trend_units(column)
@@ -55,10 +54,10 @@ module ActiveScaffold
           end
           
           def active_scaffold_search_date_bridge_range_tag(column, options, current_search)
-            range_controls = select_tag("search[#{column.name}][range]", 
+            range_controls = select_tag("#{options[:name]}[range]", 
               options_for_select( ActiveScaffold::Finder::DateRanges.collect{|range| [as_(range.downcase.to_sym), range]}, current_search["range"]), 
              :class => 'text-input', :id => nil)
-            content_tag("span", range_controls.html_safe, :id => "#{options[:id]}_range", :style => (current_search['opt'] == 'RANGE') ? nil : "display: none")
+            content_tag("span", range_controls.html_safe, :id => "#{options[:id]}_range", :class => "search-date-range", :style => (current_search['opt'] == 'RANGE') ? nil : "display: none")
           end
           
           def column_datetime?(column)

data/lib/active_scaffold/bridges/tiny_mce.rb

@@ -1,6 +1,7 @@
 class ActiveScaffold::Bridges::TinyMce < ActiveScaffold::DataStructures::Bridge
+  autoload :Helpers, 'active_scaffold/bridges/tiny_mce/helpers.rb'
   def self.install
-    require File.join(File.dirname(__FILE__), "tiny_mce/helpers.rb")
+    ActionView::Base.class_eval { include ActiveScaffold::Bridges::TinyMce::Helpers }
   end
 
   def self.install?
@@ -8,9 +9,10 @@ class ActiveScaffold::Bridges::TinyMce < ActiveScaffold::DataStructures::Bridge
   end
  
   def self.javascripts
-    if ActiveScaffold.js_framework == :jquery
+    case ActiveScaffold.js_framework
+    when :jquery
       ['tinymce-jquery', 'jquery/tiny_mce_bridge']
-    else
+    when :prototype
       ['tinymce', 'prototype/tiny_mce_bridge']
     end
   end

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

@@ -26,9 +26,10 @@ class ActiveScaffold::Bridges::TinyMce
       end
 
       def onsubmit_with_tiny_mce
-        if ActiveScaffold.js_framework == :jquery
-          submit_js = 'tinyMCE.triggerSave();$(\'textarea.mceEditor\').each(function(index, elem) { tinyMCE.execCommand(\'mceRemoveControl\', false, $(elem).attr(\'id\')); });'
-        else
+        case ActiveScaffold.js_framework
+        when :jquery
+          submit_js = 'tinyMCE.triggerSave();jQuery(\'textarea.mceEditor\').each(function(index, elem) { tinyMCE.execCommand(\'mceRemoveControl\', false, jQuery(elem).attr(\'id\')); });'
+        when :prototype
           submit_js = 'tinyMCE.triggerSave();this.select(\'textarea.mceEditor\').each(function(elem) { tinyMCE.execCommand(\'mceRemoveControl\', false, elem.id); });'
         end
         [onsubmit_without_tiny_mce, submit_js].compact.join ';'
@@ -42,5 +43,3 @@ class ActiveScaffold::Bridges::TinyMce
     end
   end
 end
-
-ActionView::Base.class_eval { include ActiveScaffold::Bridges::TinyMce::Helpers }

data/lib/active_scaffold/config/base.rb

@@ -6,7 +6,11 @@ module ActiveScaffold::Config
     def initialize(core_config)
       @core = core_config
       @action_group = self.class.action_group.clone if self.class.action_group
+
+      # start with the ActionLink defined globally
+      @link = self.class.link.clone if self.class.respond_to?(:link) && self.class.link
     end
+    attr_reader :core
 
     def self.inherited(subclass)
       class << subclass

data/lib/active_scaffold/config/core.rb

@@ -1,8 +1,6 @@
 module ActiveScaffold::Config
-  # to fix the ckeditor bridge problem
+  # to fix the ckeditor bridge problem inherit from full class name
   class Core < ActiveScaffold::Config::Base
-  # code commented out (see above)
-  #class Core < Base
     # global level configuration
     # --------------------------
 
@@ -33,6 +31,10 @@ module ActiveScaffold::Config
     cattr_accessor :cache_association_options
     @@cache_association_options = true
 
+    # enable setting ETag and LastModified on responses and using fresh_when/stale? to respond with 304 and avoid rendering views
+    cattr_accessor :conditional_get_support
+    @@conditional_get_support = false
+
     # enable saving user settings in session (per_page, limit, page, sort, search params)
     cattr_accessor :store_user_settings
     @@store_user_settings = true
@@ -55,7 +57,7 @@ module ActiveScaffold::Config
     #  * current_user_method - what method on the controller returns the current user. default: :current_user
     #  * default_permission - what the default permission is. default: true
     def self.security
-      ActiveRecordPermissions
+      ActiveScaffold::ActiveRecordPermissions
     end
 
     # columns that should be ignored for every model. these should be metadata columns like change dates, versions, etc.
@@ -109,6 +111,9 @@ module ActiveScaffold::Config
     # enable caching of association options
     attr_accessor :cache_association_options
 
+    # enable setting ETag and LastModified on responses and using fresh_when/stale? to respond with 304 and avoid rendering views
+    attr_accessor :conditional_get_support
+
     # enable saving user settings in session (per_page, limit, page, sort, search params)
     attr_accessor :store_user_settings
 
@@ -153,8 +158,9 @@ module ActiveScaffold::Config
       @columns = ActiveScaffold::DataStructures::Columns.new(self.model, attribute_names + association_column_names)
 
       # and then, let's remove some columns from the inheritable set.
+      content_columns = Set.new(self.model.content_columns.map(&:name))
       @columns.exclude(*self.class.ignore_columns)
-      @columns.exclude(*@columns.find_all { |c| c.column and (c.column.primary or c.column.name =~ /(_id|_count)$/) }.collect {|c| c.name})
+      @columns.exclude(*@columns.find_all { |c| c.column and content_columns.exclude?(c.column.name) }.collect {|c| c.name})
       @columns.exclude(*self.model.reflect_on_all_associations.collect{|a| :"#{a.name}_type" if a.options[:polymorphic]}.compact)
 
       # inherit the global frontend
@@ -162,6 +168,7 @@ module ActiveScaffold::Config
       @theme = self.class.theme
       @cache_action_link_urls = self.class.cache_action_link_urls
       @cache_association_options = self.class.cache_association_options
+      @conditional_get_support = self.class.conditional_get_support
       @store_user_settings = self.class.store_user_settings
       @sti_create_links = self.class.sti_create_links
 

data/lib/active_scaffold/config/delete.rb

@@ -4,8 +4,6 @@ module ActiveScaffold::Config
 
     def initialize(core_config)
       super
-      # start with the ActionLink defined globally
-      @link = self.class.link.clone
       @refresh_list = self.class.refresh_list
     end
 

data/lib/active_scaffold/config/field_search.rb

@@ -6,9 +6,6 @@ module ActiveScaffold::Config
       super
       @text_search = self.class.text_search
       @human_conditions = self.class.human_conditions
-
-      # start with the ActionLink defined globally
-      @link = self.class.link.clone
     end
 
 
@@ -16,7 +13,7 @@ module ActiveScaffold::Config
     # --------------------------
     # the ActionLink for this action
     cattr_reader :link
-    @@link = ActiveScaffold::DataStructures::ActionLink.new('show_search', :label => :search, :type => :collection, :security_method => :search_authorized?, :ignore_method => :search_ignore?)
+    @@link = ActiveScaffold::DataStructures::ActionLink.new('show_search', :label => :search, :type => :collection, :security_method => :search_authorized?, :ignore_method => :field_search_ignore?)
 
     # A flag for how the search should do full-text searching in the database:
     # * :full: LIKE %?%

data/lib/active_scaffold/config/form.rb

@@ -2,8 +2,6 @@ module ActiveScaffold::Config
   class Form < Base
     def initialize(core_config)
       super
-      # start with the ActionLink defined globally
-      @link = self.class.link.clone unless self.class.link.nil?
       @show_unauthorized_columns = self.class.show_unauthorized_columns
       @refresh_list = self.class.refresh_list
       @persistent = self.class.persistent

data/lib/active_scaffold/config/list.rb

@@ -18,6 +18,7 @@ module ActiveScaffold::Config
       @empty_field_text = self.class.empty_field_text
       @association_join_text = self.class.association_join_text
       @pagination = self.class.pagination
+      @auto_pagination = self.class.auto_pagination
       @show_search_reset = self.class.show_search_reset
       @reset_link = self.class.reset_link.clone
       @wrap_tag = self.class.wrap_tag
@@ -26,6 +27,7 @@ module ActiveScaffold::Config
       @messages_above_header = self.class.messages_above_header
       @auto_select_columns = self.class.auto_select_columns
       @refresh_with_header = self.class.refresh_with_header
+      @calculate_etag = self.class.calculate_etag
     end
 
     # global level configuration
@@ -65,6 +67,12 @@ module ActiveScaffold::Config
     cattr_accessor :pagination
     @@pagination = true
 
+    # Auto paginate, only can be used with pagination enabled
+    # * true: First page will be loaded on first request, next pages will be requested by AJAX until all items are loaded
+    # * false: Disable auto pagination
+    cattr_accessor :auto_pagination
+    @@auto_pagination = false
+
     # show a link to reset the search next to filtered message
     cattr_accessor :show_search_reset
     @@show_search_reset = true
@@ -90,6 +98,11 @@ module ActiveScaffold::Config
     cattr_accessor :auto_select_columns
     @@auto_select_columns = false
 
+    # Enable ETag calculation (when conditional_get_support is enabled), it requires to load records for page, when is disabled query can be avoided when page is cached in browser
+    # order clause will be used for ETag when calculate_etag is disabled, so query for records can be avoided
+    cattr_accessor :calculate_etag
+    @@calculate_etag = false
+
     # instance-level configuration
     # ----------------------------
 
@@ -119,6 +132,11 @@ module ActiveScaffold::Config
     # * false: Disable pagination
     attr_accessor :pagination
 
+    # Auto paginate, only can be used with pagination enabled
+    # * true: First page will be loaded on first request, next pages will be requested by AJAX until all items are loaded
+    # * false: Disable auto pagination
+    attr_accessor :auto_pagination
+
     # what string to use when a field is empty
     attr_accessor :empty_field_text
 
@@ -169,6 +187,14 @@ module ActiveScaffold::Config
     end
     
     def search_partial
+      if @always_show_search == true
+        auto_search_partial
+      else
+        @always_show_search.to_s if @core.actions.include? @always_show_search 
+      end
+    end
+    
+    def auto_search_partial
       return "search" if @core.actions.include?(:search)
       return "field_search" if @core.actions.include?(:field_search)
     end
@@ -198,6 +224,10 @@ module ActiveScaffold::Config
     # Enable auto select columns on list, so only columns needed for list columns are selected
     attr_accessor :auto_select_columns
 
+    # Enable ETag calculation (when conditional_get_support is enabled), it requires to load records for page, when is disabled query can be avoided when page is cached in browser
+    # order clause will be used for ETag when calculate_etag is disabled, so query for records can be avoided
+    attr_accessor :calculate_etag
+
     class UserSettings < UserSettings
       def initialize(conf, storage, params)
         super(conf, storage, params, :list)
@@ -216,7 +246,7 @@ module ActiveScaffold::Config
       end
 
       def page
-        self['page'] = @params['page'] if @params.has_key? 'page'
+        self['page'] = @params['page'] || 1 if @params.has_key?('page') || @conf.auto_pagination
         self['page'] || 1
       end
 

data/lib/active_scaffold/config/search.rb

@@ -7,9 +7,6 @@ module ActiveScaffold::Config
       @text_search = self.class.text_search
       @live = self.class.live?
       @split_terms = self.class.split_terms
-
-      # start with the ActionLink defined globally
-      @link = self.class.link.clone
     end
 
 

data/lib/active_scaffold/config/show.rb

@@ -2,12 +2,6 @@ module ActiveScaffold::Config
   class Show < Base
     self.crud_type = :read
 
-    def initialize(core_config)
-      super
-      # start with the ActionLink defined globally
-      @link = self.class.link.clone
-    end
-
     # global level configuration
     # --------------------------
     cattr_accessor :link

data/lib/active_scaffold/config/subform.rb

@@ -22,6 +22,7 @@ module ActiveScaffold::Config
       unless @columns
         if @core.actions.include? :update
           @columns = @core.update.columns.clone
+          @columns.action = self
         else
           self.columns = @core.columns._inheritable
         end

data/lib/active_scaffold/configurable.rb

@@ -7,7 +7,7 @@ module ActiveScaffold
   module Configurable
     def configure(&configuration_block)
       return unless configuration_block
-      @configuration_binding = configuration_block.binding
+      @configuration_binding = eval("self", configuration_block.binding)
       ret = instance_exec self, &configuration_block
       @configuration_binding = nil
       return ret
@@ -21,7 +21,7 @@ module ActiveScaffold
         if @configuration_binding.nil?
           raise $!
         else
-          eval("self", @configuration_binding).send(name, *args)
+          @configuration_binding.send(name, *args)
         end
       end
     end

data/lib/active_scaffold/constraints.rb

@@ -55,7 +55,7 @@ module ActiveScaffold
             field = far_association.klass.primary_key
             table = far_association.table_name
 
-            active_scaffold_includes.concat([{k => far_association.name}]) # e.g. {:den => :park}
+            active_scaffold_references.concat([{k => far_association.name}]) # e.g. {:den => :park}
             hash_conditions.merge!("#{table}.#{field}" => v.values.first)
 
           # association column constraint
@@ -63,13 +63,17 @@ module ActiveScaffold
             if column.association.macro == :has_and_belongs_to_many
               active_scaffold_habtm_joins.concat column.includes
             elsif !column.association.options[:polymorphic]
-              active_scaffold_includes.concat column.includes
+              if column.association.macro == :belongs_to
+                active_scaffold_preload.concat column.includes
+              else
+                active_scaffold_references.concat column.includes
+              end
             end
             hash_conditions.merge!(condition_from_association_constraint(column.association, v))
 
           # regular column constraints
           elsif column.searchable? && params[column.name] != v
-            active_scaffold_includes.concat column.includes if column.includes.present?
+            active_scaffold_references.concat column.references 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
@@ -90,23 +94,16 @@ module ActiveScaffold
       # we have to use the other model's primary_key.
       #
       # please see the relevant tests for concrete examples.
-      field = if [:has_one, :has_many].include?(association.macro)
+
+      field = if [:has_one, :has_many, :has_and_belongs_to_many].include?(association.macro)
         association.klass.primary_key
-      elsif [:has_and_belongs_to_many].include?(association.macro)
-        association.association_foreign_key
       else
         association.options[:foreign_key] || association.name.to_s.foreign_key
       end
 
       table = case association.macro
-        when :has_and_belongs_to_many
-        association.options[:join_table]
-
-        when :belongs_to
-        active_scaffold_config.model.table_name
-
-        else
-        association.table_name
+        when :belongs_to then active_scaffold_config.model.table_name
+        else association.table_name
       end
 
       if association.options[:primary_key]

data/lib/active_scaffold/core.rb

@@ -0,0 +1,277 @@
+module ActiveScaffold
+  module Core
+    def self.included(base)
+      base.extend(ClassMethods)
+      base.module_eval do
+        # TODO: these should be in actions/core
+        before_filter :handle_user_settings
+        before_filter :check_input_device
+      end
+
+      base.helper_method :touch_device?
+      base.helper_method :hover_via_click?
+      base.helper_method :active_scaffold_constraints
+    end
+
+    def active_scaffold_config
+      self.class.active_scaffold_config
+    end
+
+    def active_scaffold_config_for(klass)
+      self.class.active_scaffold_config_for(klass)
+    end
+
+    def active_scaffold_session_storage_key(id = nil)
+      id ||= params[:eid] || "#{params[:controller]}#{"_#{nested_parent_id}" if nested?}"
+      "as:#{id}"
+    end
+
+    def active_scaffold_session_storage(id = nil)
+      session_index = active_scaffold_session_storage_key(id)
+      session[session_index] ||= {}
+      session[session_index]
+    end
+
+    def clear_storage
+      session_index = active_scaffold_session_storage_key
+      session.delete(session_index) unless session[session_index].present?
+    end
+
+    # at some point we need to pass the session and params into config. we'll just take care of that before any particular action occurs by passing those hashes off to the UserSettings class of each action.
+    def handle_user_settings
+      if self.class.uses_active_scaffold?
+        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
+          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
+
+    def check_input_device
+      if request.env["HTTP_USER_AGENT"] && request.env["HTTP_USER_AGENT"][/(iPhone|iPod|iPad)/i]
+        session[:input_device_type] = 'TOUCH'
+        session[:hover_supported] = false
+      else
+        session[:input_device_type] = 'MOUSE'
+        session[:hover_supported] = true
+      end if session[:input_device_type].nil?
+     end
+
+    def touch_device?
+      session[:input_device_type] == 'TOUCH'
+    end
+
+    def hover_via_click?
+      session[:hover_supported] == false
+    end
+      
+    module ClassMethods
+      def active_scaffold(model_id = nil, &block)
+        extend Prefixes
+        # initialize bridges here
+        ActiveScaffold::Bridges.run_all
+
+        # converts Foo::BarController to 'bar' and FooBarsController to 'foo_bar' and AddressController to 'address'
+        model_id = self.to_s.split('::').last.sub(/Controller$/, '').pluralize.singularize.underscore unless model_id
+
+        # run the configuration
+        @active_scaffold_config = ActiveScaffold::Config::Core.new(model_id)
+        @active_scaffold_config_block = block
+        self.links_for_associations
+        
+        self.active_scaffold_superclasses_blocks.each {|superblock| self.active_scaffold_config.configure &superblock}
+        self.active_scaffold_config.sti_children = nil # reset sti_children if set in parent block
+        self.active_scaffold_config.configure &block if block_given?
+        self.active_scaffold_config._configure_sti unless self.active_scaffold_config.sti_children.nil?
+        self.active_scaffold_config._load_action_columns
+
+        # defines the attribute read methods on the model, so record.send() doesn't find protected/private methods instead
+        klass = self.active_scaffold_config.model
+        # Rails 4.0.4 has removed attribute_methods_generated,
+        # and made define_attribute_methods threadsave to call multiple times.
+        # Check for that here.
+        if ((Rails::VERSION::MAJOR == 4) && !klass.respond_to?(:attribute_methods_generated)) ||
+            !klass.attribute_methods_generated?
+          klass.define_attribute_methods
+        end
+        # include the rest of the code into the controller: the action core and the included actions
+        module_eval do
+          include ActiveScaffold::Finder
+          include ActiveScaffold::Constraints
+          include ActiveScaffold::AttributeParams
+          include ActiveScaffold::Actions::Core
+          active_scaffold_config.actions.each do |mod|
+            name = mod.to_s.camelize
+            include "ActiveScaffold::Actions::#{name}".constantize
+
+            # sneak the action links from the actions into the main set
+            mod_conf = active_scaffold_config.send(mod)
+            if mod_conf.respond_to?(:link) && (link = mod_conf.link)
+              if link.is_a? Array
+                link.each {|current| active_scaffold_config.action_links.add_to_group(current, active_scaffold_config.send(mod).action_group)}
+              elsif link.is_a? ActiveScaffold::DataStructures::ActionLink
+                active_scaffold_config.action_links.add_to_group(link, active_scaffold_config.send(mod).action_group)
+              end
+            end
+          end
+        end
+        self._add_sti_create_links if self.active_scaffold_config.add_sti_create_links?
+      end
+
+      module Prefixes
+        def parent_prefixes
+          @parent_prefixes ||= super << 'active_scaffold_overrides'
+        end
+      end
+
+      # To be called after include action modules
+      def _add_sti_create_links
+        new_action_link = active_scaffold_config.action_links.collection['new']
+        unless new_action_link.nil? || active_scaffold_config.sti_children.empty?
+          active_scaffold_config.action_links.collection.delete('new')
+          active_scaffold_config.sti_children.each do |child|
+            new_sti_link = Marshal.load(Marshal.dump(new_action_link)) # deep clone
+            new_sti_link.label = as_(:create_model, :model => child.to_s.camelize.constantize.model_name.human)
+            new_sti_link.parameters = {:parent_sti => controller_path}
+            new_sti_link.controller = Proc.new { active_scaffold_controller_for(child.to_s.camelize.constantize).controller_path }
+            active_scaffold_config.action_links.collection.create.add(new_sti_link)
+          end
+        end
+      end
+
+      # Create the automatic column links. Note that this has to happen when configuration is *done*, because otherwise the Nested module could be disabled. Actually, it could still be disabled later, couldn't it?
+      def links_for_associations
+        return unless active_scaffold_config.actions.include? :list and active_scaffold_config.actions.include? :nested
+        active_scaffold_config.columns.each do |column|
+          next unless column.link.nil? and column.autolink?
+          #lazy load of action_link, cause it was really slowing down app in dev mode
+          #and might lead to trouble cause of cyclic constantization of controllers
+          #and might be unnecessary cause it is done before columns are configured
+          column.set_link(Proc.new {|col| link_for_association(col)})
+        end
+      end
+      
+      def active_scaffold_controller_for_column(column, options = {})
+        begin
+          if column.polymorphic_association?
+            :polymorph
+          elsif options.include?(:controller)
+            "#{options[:controller].to_s.camelize}Controller".constantize
+          else
+            active_scaffold_controller_for(column.association.klass)
+          end
+        rescue ActiveScaffold::ControllerNotFound
+          nil        
+        end
+      end
+      
+      def link_for_association(column, options = {})
+        controller = active_scaffold_controller_for_column(column, options)
+        
+        unless controller.nil?
+          options.reverse_merge! :position => :after, :type => :member, :controller => (controller == :polymorph ? controller : controller.controller_path), :column => column
+          options[:parameters] ||= {}
+          options[:parameters].reverse_merge! :association => column.association.name
+          if column.plural_association?
+            ActiveScaffold::DataStructures::ActionLink.new('index', options.merge(:refresh_on_close => true))
+          else
+            actions = controller.active_scaffold_config.actions unless controller == :polymorph
+            actions ||= [:create, :update, :show] 
+            column.actions_for_association_links.delete :new unless actions.include? :create
+            column.actions_for_association_links.delete :edit unless actions.include? :update
+            column.actions_for_association_links.delete :show unless actions.include? :show
+            ActiveScaffold::DataStructures::ActionLink.new(nil, options.merge(:html_options => {:class => column.name}))
+          end 
+        end
+      end
+      
+      def link_for_association_as_scope(scope, options = {})
+        options.reverse_merge! :label => scope, :position => :after, :type => :member, :controller => controller_path
+        options[:parameters] ||= {}
+        options[:parameters].reverse_merge! :named_scope => scope
+        ActiveScaffold::DataStructures::ActionLink.new('index', options)
+      end
+
+      def add_active_scaffold_path(path)
+        as_path = File.join(ActiveScaffold::Config::Core.plugin_directory, 'app', 'views')
+        index = view_paths.find_index { |p| p.to_s == as_path }
+        if index
+          self.view_paths = view_paths[0..index-1] + Array(path) + view_paths[index..-1]
+        else
+          append_view_path path
+        end
+      end
+
+      def active_scaffold_config
+        if @active_scaffold_config.nil?
+          self.superclass.active_scaffold_config if self.superclass.respond_to? :active_scaffold_config
+        else
+          @active_scaffold_config
+        end
+      end
+
+      def active_scaffold_config_block
+        @active_scaffold_config_block
+      end
+
+      def active_scaffold_superclasses_blocks
+        blocks = []
+        klass = self.superclass
+        while klass.respond_to? :active_scaffold_superclasses_blocks
+          blocks << klass.active_scaffold_config_block
+          klass = klass.superclass
+        end
+        blocks.compact.reverse
+      end
+
+      def active_scaffold_config_for(klass)
+        begin
+          controller = active_scaffold_controller_for(klass)
+        rescue ActiveScaffold::ControllerNotFound
+          config = ActiveScaffold::Config::Core.new(klass)
+          config._load_action_columns
+          config
+        else
+          controller.active_scaffold_config
+        end
+      end
+
+      def active_scaffold_controller_for(klass)
+        ActiveScaffold::Core.active_scaffold_controller_for(klass, self.to_s.split('::')[0...-1].join('::') + '::')
+      end
+
+
+      def uses_active_scaffold?
+        !active_scaffold_config.nil?
+      end
+    end
+
+    # Tries to find a controller for the given ActiveRecord model.
+    # Searches in the namespace of the current controller for singular and plural versions of the conventional "#{model}Controller" syntax.
+    # You may override this method to customize the search routine.
+    def self.active_scaffold_controller_for(klass, controller_namespace = '::')
+      error_message = []
+      [controller_namespace, ''].each do |namespace|
+        ["#{klass.to_s.underscore.pluralize}", "#{klass.to_s.underscore.pluralize.singularize}"].each do |controller_name|
+          begin
+            controller = "#{namespace}#{controller_name.camelize}Controller".constantize
+          rescue NameError => error
+            # Only rescue NameError associated with the controller constant not existing - not other compile errors
+            if error.message["uninitialized constant #{controller}"]
+              error_message << "#{namespace}#{controller_name.camelize}Controller"
+              next
+            else
+              raise
+            end
+          end
+          raise ActiveScaffold::ControllerNotFound, "#{controller} missing ActiveScaffold", caller unless controller.uses_active_scaffold?
+          raise ActiveScaffold::ControllerNotFound, "ActiveScaffold on #{controller} is not for #{klass} model.", caller unless controller.active_scaffold_config.model.to_s == klass.to_s
+          return controller
+        end
+      end
+      raise ActiveScaffold::ControllerNotFound, "Could not find " + error_message.join(" or "), caller
+    end
+  end
+end