active_scaffold_vho 3.0.31 → 3.1.0

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

@@ -1,22 +1,8 @@
-
-
 ActiveScaffold::Bridges.bridge "DatePicker" do
   install do
-    directory = File.dirname(__FILE__)
-    source = File.join(directory, "public/javascripts/date_picker_bridge.js")
-    destination = File.join(Rails.root, "public/javascripts/active_scaffold/default/")
-
-    if ActiveScaffold.js_framework == :jquery
-      require File.join(directory, "lib/datepicker_bridge.rb")
-      unless defined?(ACTIVE_SCAFFOLD_INSTALL_ASSETS) && ACTIVE_SCAFFOLD_INSTALL_ASSETS == false
-        FileUtils.cp(source, destination)
-        ActiveScaffold::Bridges::DatePickerBridge.localization(File.join(destination, 'date_picker_bridge.js'))
-      end
-    else
-      # make sure that jquery files are removed
-      FileUtils.rm(File.join(destination, 'date_picker_bridge.js')) if File.exist?(File.join(destination, 'date_picker_bridge.js'))
-    end
+    require File.join(File.dirname(__FILE__), "lib/datepicker_bridge.rb") if ActiveScaffold.js_framework == :jquery
   end
+
   
   install? do
     true

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

@@ -34,90 +34,121 @@ module ActiveScaffold
         '%a' => 'D',
         '%A' => 'DD',
         '%b' => 'M',
-        '%B' => 'MM',
+        '$B' => 'MM',
         '%d' => 'dd',
         '%e' => 'd',
         '%j' => 'oo',
         '%m' => 'mm',
         '%y' => 'y',
         '%Y' => 'yy',
-        '%H' => 'HH', # options ampm => false
+        '%H' => 'hh', # options ampm => false
         '%I' => 'hh', # options ampm => true
         '%M' => 'mm',
         '%p' => 'tt',
         '%S' => 'ss'
       }
       
-      def self.localization(js_file)
-        localization = "jQuery(function($){
+      def self.localization
+        "jQuery(function($){
   if (typeof($.datepicker) === 'object') {
-    $.datepicker.regional['#{I18n.locale}'] = #{date_options.to_json};
+    #{date_options_for_locales}
     $.datepicker.setDefaults($.datepicker.regional['#{I18n.locale}']);
   }
   if (typeof($.timepicker) === 'object') {
-    $.timepicker.regional['#{I18n.locale}'] = #{datetime_options.to_json};
+    #{datetime_options_for_locales}
     $.timepicker.setDefaults($.timepicker.regional['#{I18n.locale}']);
   }
 });\n"        
-        prepend_js_file(js_file, localization)        
       end
-      
-      def self.date_options
-        date_options = I18n.translate! 'date'
-        date_picker_options = { :closeText => as_(:close),
-          :prevText => as_(:previous),
-          :nextText => as_(:next),
-          :currentText => as_(:today),
-          :monthNames => date_options[:month_names][1, (date_options[:month_names].length - 1)],
-          :monthNamesShort => date_options[:abbr_month_names][1, (date_options[:abbr_month_names].length - 1)],
-          :dayNames => date_options[:day_names],
-          :dayNamesShort => date_options[:abbr_day_names],
-          :dayNamesMin => date_options[:abbr_day_names],
-          :changeYear => true,
-          :changeMonth => true,
-        }
 
+      def self.date_options_for_locales
+        I18n.available_locales.collect do |locale|
+          locale_date_options = date_options(locale)
+          if locale_date_options
+            "$.datepicker.regional['#{locale}'] = #{locale_date_options.to_json};"
+          else
+            nil
+          end
+        end.compact.join('')
+      end
+      
+      def self.date_options(locale)
         begin
-          as_date_picker_options = I18n.translate! 'active_scaffold.date_picker_options'
-          date_picker_options.merge!(as_date_picker_options) if as_date_picker_options.is_a? Hash
+          date_options = I18n.translate! 'date', :locale => locale
+          date_picker_options = { :closeText => as_(:close),
+            :prevText => as_(:previous),
+            :nextText => as_(:next),
+            :currentText => as_(:today),
+            :monthNames => date_options[:month_names][1, (date_options[:month_names].length - 1)],
+            :monthNamesShort => date_options[:abbr_month_names][1, (date_options[:abbr_month_names].length - 1)],
+            :dayNames => date_options[:day_names],
+            :dayNamesShort => date_options[:abbr_day_names],
+            :dayNamesMin => date_options[:abbr_day_names],
+            :changeYear => true,
+            :changeMonth => true,
+          }
+
+          begin
+            as_date_picker_options = I18n.translate! 'active_scaffold.date_picker_options'
+            date_picker_options.merge!(as_date_picker_options) if as_date_picker_options.is_a? Hash
+          rescue
+            Rails.logger.warn "ActiveScaffold: Missing date picker localization for your locale: #{locale}"
+          end
+
+          js_format = self.to_datepicker_format(date_options[:formats][:default])
+          date_picker_options[:dateFormat] = js_format unless js_format.nil?
+          date_picker_options
         rescue
-          Rails.logger.warn "ActiveScaffold: Missing date picker localization for your locale: #{I18n.locale}"
+          if locale == I18n.locale
+            raise
+          else
+            nil
+          end
         end
+      end
 
-        js_format = self.to_datepicker_format(date_options[:formats][:default])
-        date_picker_options[:dateFormat] = js_format unless js_format.nil? 
-        date_picker_options
+      def self.datetime_options_for_locales
+        I18n.available_locales.collect do |locale|
+          locale_datetime_options = datetime_options(locale)
+          if locale_datetime_options
+            "$.timepicker.regional['#{locale}'] = #{locale_datetime_options.to_json};"
+          else
+            nil
+          end
+        end.compact.join('')
       end
       
-      def self.datetime_options
-        rails_time_format = I18n.translate! 'time.formats.default'
-        datetime_options = I18n.translate! 'datetime.prompts'
-        datetime_picker_options = {:ampm => false,
-          :hourText => datetime_options[:hour],
-				  :minuteText => datetime_options[:minute],
-				  :secondText => datetime_options[:second],
-        }
-        
+      def self.datetime_options(locale)
         begin
-          as_datetime_picker_options = I18n.translate! 'active_scaffold.datetime_picker_options'
-          datetime_picker_options.merge!(as_datetime_picker_options) if as_datetime_picker_options.is_a? Hash
+          rails_time_format = I18n.translate! 'time.formats.default', :locale => locale
+          datetime_options = I18n.translate! 'datetime.prompts', :locale => locale
+          datetime_picker_options = {:ampm => false,
+            :hourText => datetime_options[:hour],
+            :minuteText => datetime_options[:minute],
+            :secondText => datetime_options[:second],
+          }
+
+          begin
+            as_datetime_picker_options = I18n.translate! 'active_scaffold.datetime_picker_options'
+            datetime_picker_options.merge!(as_datetime_picker_options) if as_datetime_picker_options.is_a? Hash
+          rescue
+            Rails.logger.warn "ActiveScaffold: Missing datetime picker localization for your locale: #{locale}"
+          end
+
+          date_format, time_format = self.split_datetime_format(self.to_datepicker_format(rails_time_format))
+          datetime_picker_options[:dateFormat] = date_format unless date_format.nil?
+          unless time_format.nil?
+            datetime_picker_options[:timeFormat] = time_format
+            datetime_picker_options[:ampm] = true if rails_time_format.include?('%I')
+          end
+          datetime_picker_options
         rescue
-          Rails.logger.warn "ActiveScaffold: Missing datetime picker localization for your locale: #{I18n.locale}"
-        end
-        
-        date_format, time_format = self.split_datetime_format(self.to_datepicker_format(rails_time_format))
-        datetime_picker_options[:dateFormat] = date_format unless date_format.nil?
-        unless time_format.nil?
-          datetime_picker_options[:timeFormat] = time_format
-          datetime_picker_options[:ampm] = true if rails_time_format.include?('%I')
+          if locale == I18n.locale
+            raise
+          else
+            nil
+          end
         end
-        datetime_picker_options
-      end
-      
-      def self.prepend_js_file(js_file, prepend)
-        content = File.binread(js_file)
-        content.gsub!(/\A/, prepend)
-        File.open(js_file, 'wb') { |file| file.write(content) }
       end
       
       def self.to_datepicker_format(rails_format)
@@ -137,13 +168,12 @@ module ActiveScaffold
       def self.split_datetime_format(datetime_format)
         date_format = datetime_format
         time_format = nil
-        time_start_indicators = %w{HH hh mm tt ss}
+        time_start_indicators = %w{hh mm tt ss}
         unless datetime_format.nil?
           start_indicator = time_start_indicators.detect {|indicator| datetime_format.include?(indicator)}
           unless start_indicator.nil?
             pos_time_format = datetime_format.index(start_indicator)
             date_format = datetime_format.to(pos_time_format - 1)
-            date_format.strip!
             time_format = datetime_format.from(pos_time_format)
           end
         end

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

@@ -1,6 +1,6 @@
 ActiveScaffold::Bridges.bridge "FileColumn" do
   install do
-    if ActiveScaffold::Config::Core.instance_method_names.include?("initialize_with_file_column")
+    if ActiveScaffold::Config::Core.instance_methods.include?("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__), "lib/as_file_column_bridge")

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

@@ -24,7 +24,7 @@ module ActiveScaffold::Config
       }
     end
     
-    alias_method_chain :initialize, :file_column unless self.instance_method_names.include?("initialize_without_file_column")
+    alias_method_chain :initialize, :file_column unless self.instance_methods.include?("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/lib/file_column_helpers.rb

@@ -5,7 +5,7 @@ module ActiveScaffold
         module FileColumnHelpers
           class << self
             def file_column_fields(klass)
-              klass.instance_method_names.grep(/_just_uploaded\?$/).collect{|m| m[0..-16].to_sym }
+              klass.instance_methods.grep(/_just_uploaded\?$/).collect{|m| m[0..-16].to_sym }
             end
             
             def generate_delete_helpers(klass)

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

@@ -1,6 +1,6 @@
 ActiveScaffold::Bridges.bridge "Paperclip" do
   install do
-    if ActiveScaffold::Config::Core.instance_method_names.include?("initialize_with_paperclip")
+    if ActiveScaffold::Config::Core.instance_methods.include?("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__), "lib/form_ui")

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

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

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

@@ -73,13 +73,13 @@ module ActiveScaffold
               range_type, range = value[:range].downcase.split('_')
               format = active_scaffold_human_condition_date_bridge_range_format(range_type, range)
               from, to = controller.class.date_bridge_from_to(column, value)
-              "#{column.active_record_class.human_attribute_name(column.name)} = #{as_(value[:range].downcase).downcase} (#{I18n.l(from, :format => format)})" unless from.nil?
+              "#{column.active_record_class.human_attribute_name(column.name)} = #{as_(value[:range].downcase).downcase} (#{I18n.l(from, :format => format)})"
             when 'PAST', 'FUTURE'
               from, to = controller.class.date_bridge_from_to(column, value)
-              "#{column.active_record_class.human_attribute_name(column.name)} #{as_('BETWEEN'.downcase).downcase} #{I18n.l(from)} - #{I18n.l(to)}" unless from.nil? || to.nil?
+              "#{column.active_record_class.human_attribute_name(column.name)} #{as_('BETWEEN'.downcase).downcase} #{I18n.l(from)} - #{I18n.l(to)}"
             else
               from, to = controller.class.date_bridge_from_to(column, value)
-              "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt].downcase).downcase} #{I18n.l(from)} #{value[:opt] == 'BETWEEN' ? '- ' + I18n.l(to) : ''}" unless from.nil? || (value[:opt] == 'BETWEEN' && to.nil?)
+              "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt].downcase).downcase} #{I18n.l(from)} #{value[:opt] == 'BETWEEN' ? '- ' + I18n.l(to) : ''}"
             end
           end
 

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

@@ -1,18 +1,6 @@
 ActiveScaffold::Bridges.bridge "TinyMCE" do
   install do
     require File.join(File.dirname(__FILE__), "lib/tiny_mce_bridge.rb")
-    directory = File.dirname(__FILE__)
-    destination = File.join(Rails.root, "public/javascripts/active_scaffold/default/")
-
-    if ActiveScaffold.js_framework == :jquery
-      source = File.join(directory, "public/javascripts/jquery/tiny_mce_bridge.js")
-      FileUtils.rm(File.join(destination, 'tiny_mce_bridge.js')) if File.exist?(File.join(destination, 'tiny_mce_bridge.js'))
-      FileUtils.cp(source, destination)
-    else
-      source = File.join(directory, "public/javascripts/prototype/tiny_mce_bridge.js")
-      FileUtils.rm(File.join(destination, 'tiny_mce_bridge.js')) if File.exist?(File.join(destination, 'tiny_mce_bridge.js'))
-      FileUtils.cp(source, destination)
-    end unless defined?(ACTIVE_SCAFFOLD_INSTALL_ASSETS) && ACTIVE_SCAFFOLD_INSTALL_ASSETS == false
   end
 
   install? do

data/lib/active_scaffold/bridges/validation_reflection/lib/validation_reflection_bridge.rb

@@ -7,7 +7,7 @@ module ActiveScaffold
     def initialize_with_validation_reflection(name, active_record_class)
       initialize_without_validation_reflection(name, active_record_class)
       column_names = [name]
-      column_names << @association.primary_key_name if @association
+      column_names << @association.foreign_key if @association
       self.required = column_names.any? do |column_name|
         active_record_class.reflect_on_validations_for(column_name.to_sym).any? do |val|
           val.macro == :validates_presence_of or (val.macro == :validates_inclusion_of and not val.options[:allow_nil] and not val.options[:allow_blank])

data/lib/active_scaffold/config/base.rb

@@ -26,7 +26,7 @@ module ActiveScaffold::Config
 
     # define a default action_group for this action
     # e.g. 'members.crud'
-    class_inheritable_accessor :action_group
+    class_attribute :action_group
 
     # action_group this action should belong to
     attr_accessor :action_group

data/lib/active_scaffold/config/core.rb

@@ -167,14 +167,7 @@ module ActiveScaffold::Config
       klass = "ActiveScaffold::Config::#{titled_name}".constantize rescue nil
       if klass
         if @actions.include? underscored_name
-          @action_configs[name] ||= klass.new(self)
-          eigenclass = class << self; self; end
-          eigenclass.class_eval do
-            define_method(name) do
-              @action_configs[name]
-            end
-          end
-         return send(name)
+          return @action_configs[underscored_name] ||= klass.new(self)
         else
           raise "#{titled_name} is not enabled. Please enable it or remove any references in your configuration (e.g. config.#{underscored_name}.columns = [...])."
         end

data/lib/active_scaffold/config/delete.rb

@@ -16,7 +16,7 @@ module ActiveScaffold::Config
 
     # the ActionLink for this action
     cattr_accessor :link
-    @@link = ActiveScaffold::DataStructures::ActionLink.new('destroy', :label => :delete, :type => :member, :confirm => :are_you_sure_to_delete, :method => :delete, :crud_type => :delete, :position => false, :parameters => {:destroy_action => true}, :security_method => :delete_authorized?, :ignore_method => :delete_ignore?)
+    @@link = ActiveScaffold::DataStructures::ActionLink.new('destroy', :label => :delete, :type => :member, :confirm => :are_you_sure_to_delete, :method => :delete, :crud_type => :delete, :position => false, :parameters => {:destroy_action => true}, :security_method => :delete_authorized?)
 
     # whether we should refresh list after destroy or not
     cattr_accessor :refresh_list

data/lib/active_scaffold/config/field_search.rb

@@ -6,7 +6,6 @@ module ActiveScaffold::Config
       @core = core_config
 
       @text_search = self.class.text_search
-      @or_delimiter = self.class.or_delimiter
 
       # start with the ActionLink defined globally
       @link = self.class.link.clone
@@ -29,11 +28,6 @@ module ActiveScaffold::Config
     cattr_accessor :text_search
     @@text_search = :full
 
-    # delimiter to seperate or search string such us: name = Paul,Bernd,Klaus
-    # will search for Paul Or Bernd Or Klaus
-    cattr_accessor :or_delimiter
-    @@or_delimiter = ','
-
     # instance-level configuration
     # ----------------------------
 
@@ -56,33 +50,18 @@ module ActiveScaffold::Config
     # * false: LIKE ?
     # Default is :full
     attr_accessor :text_search
-
-    attr_accessor :or_delimiter
     
     # the ActionLink for this action
     attr_accessor :link
     
     # rarely searched columns may be placed in a hidden subgroup
-    def optional_columns=(optionals)
+     def optional_columns=(optionals)
       @optional_columns= Array(optionals)
     end
     
     def optional_columns
       @optional_columns ||= []
     end
-
-    # columns which should support or searches
-    # eg like 'x' or ... like 'y'
-    def or_columns=(or_columns)
-      @or_columns = Array(or_columns)
-    end
-
-    def or_columns
-      unless @or_columns
-        self.or_columns = @core.columns.collect{|c| c.name if @core.columns._inheritable.include?(c.name) and c.searchable? and c.column and c.column.text?}.compact
-      end
-      @or_columns
-    end
     
     # default search params
     # default_params = {:title => {"from"=>"test", "to"=>"", "opt"=>"%?%"}} 

data/lib/active_scaffold/config/list.rb

@@ -128,11 +128,6 @@ module ActiveScaffold::Config
     attr_accessor :nested_auto_open
     
     class UserSettings < UserSettings
-      def initialize(conf, storage, params)
-        super(conf,storage,params)
-        @sorting = nil
-      end
-
       # This label has alread been localized.
       def label
         @session[:label] ? @session[:label] : @conf.label
@@ -164,20 +159,17 @@ module ActiveScaffold::Config
       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.
-          @session['sort'] = [@params['sort'], @params['sort_direction']] if @params['sort'] and @params['sort_direction']
-          @session['sort'] = nil if @params['sort_direction'] == 'reset'
-
-          if @session['sort']
-            sorting = @conf.sorting.clone
-            sorting.set(*@session['sort'])
-            @sorting = sorting
-          else
-            @sorting = default_sorting
-          end
+        # 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.
+        @session['sort'] = [@params['sort'], @params['sort_direction']] if @params['sort'] and @params['sort_direction']
+        @session['sort'] = nil if @params['sort_direction'] == 'reset'
+
+        if @session['sort']
+          sorting = @conf.sorting.clone
+          sorting.set(*@session['sort'])
+          return sorting
+        else
+          return default_sorting
         end
-        @sorting
       end
       
       def count_includes

data/lib/active_scaffold/data_structures/action_link.rb

@@ -67,6 +67,15 @@ module ActiveScaffold::DataStructures
     def confirm?
       @confirm ? true : false
     end
+    
+    # if the action uses a DHTML based (i.e. 2-phase) confirmation
+    attr_writer :dhtml_confirm
+    def dhtml_confirm
+      @dhtml_confirm
+    end
+    def dhtml_confirm?
+      @dhtml_confirm
+    end
 
     # what method to call on the controller to see if this action_link should be visible
     # note that this is only the UI part of the security. to prevent URL hax0rz, you also need security on requests (e.g. don't execute update method unless authorized).

data/lib/active_scaffold/data_structures/action_links.rb

@@ -173,7 +173,7 @@ module ActiveScaffold::DataStructures
     protected
 
     def skip_action_link(controller, link, *args)
-      (!link.ignore_method.nil? && controller.respond_to?(link.ignore_method) && controller.send(link.ignore_method, *args)) || ((link.security_method_set? or controller.respond_to? link.security_method) and !controller.send(link.security_method, *args))
+      (!link.ignore_method.nil? and controller.try(link.ignore_method, *args)) || ((link.security_method_set? or controller.respond_to? link.security_method) and !controller.send(link.security_method, *args))
     end
 
     # called during clone or dup. makes the clone/dup deeper.

data/lib/active_scaffold/data_structures/column.rb

@@ -181,26 +181,6 @@ module ActiveScaffold::DataStructures
     # to modify the default order of columns
     attr_accessor :weight
 
-    # whether the field should be stripped when search values or form values are read for this value
-    attr_writer :stripable
-    def stripable?
-      @stripable
-    end
-
-    def stripped_value(value)
-      if stripable?
-        begin
-          value.strip
-        rescue
-          Rails.logger.error("stripped_value: column #{self.name} is a db text column, but value is nt a string: #{value.inspect}. Please define column[:#{self.name}].stripable = false in config")
-          value
-        end
-      else
-        value
-      end
-    end
-
-
     # to set how many associated records a column with plural association must show in list
     cattr_accessor :associated_limit
     @@associated_limit = 3
@@ -248,11 +228,6 @@ module ActiveScaffold::DataStructures
     def plural_association?
       self.association and [:has_many, :has_and_belongs_to_many].include? self.association.macro
     end
-
-    def belongs_to_association?
-      self.association && self.association.macro == :belongs_to
-    end
-
     def through_association?
       self.association and self.association.options[:through]
     end
@@ -303,7 +278,6 @@ module ActiveScaffold::DataStructures
       @options = {:format => :i18n_number} if @column.try(:number?)
       @form_ui = :checkbox if @column and @column.type == :boolean
       @form_ui = :textarea if @column and @column.type == :text
-      @stripable = true if @column and @column.text?
       @allow_add_existing = true
       @form_ui = self.class.association_form_ui if @association && self.class.association_form_ui
       
@@ -321,7 +295,7 @@ module ActiveScaffold::DataStructures
     # just the field (not table.field)
     def field_name
       return nil if virtual?
-      column ? @active_record_class.connection.quote_column_name(column.name) : association.primary_key_name
+      column ? @active_record_class.connection.quote_column_name(column.name) : association.foreign_key
     end
 
     def <=>(other_column)
@@ -337,7 +311,7 @@ module ActiveScaffold::DataStructures
         self.sort = false
       else
         if self.singular_association?
-          self.sort = {:method => "#{self.name}.nil? ? '' : #{self.name}.to_label"}
+          self.sort = {:method => "#{self.name}.to_s"}
         elsif self.plural_association?
           self.sort = {:method => "#{self.name}.join(',')"}
         else
@@ -348,7 +322,7 @@ module ActiveScaffold::DataStructures
     
     def initialize_search_sql
       self.search_sql = unless self.virtual?
-        if association.nil? || self.belongs_to_association?
+        if association.nil?
           self.field.to_s
         elsif !self.polymorphic_association?
           [association.klass.table_name, association.klass.primary_key].collect! do |str|
@@ -363,7 +337,7 @@ module ActiveScaffold::DataStructures
 
     # the table.field name for this column, if applicable
     def field
-      @field ||= [@active_record_class.connection.quote_column_name(@table), field_name].join('.')
+      @field ||= [@active_record_class.connection.quote_table_name(@table), field_name].join('.')
     end
     
     def estimate_weight

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -98,13 +98,13 @@ module ActiveScaffold::DataStructures
     
     def iterate_model_associations(model)
       @constrained_fields = [] 
-      @constrained_fields << association.primary_key_name.to_sym unless association.belongs_to?
+      @constrained_fields << association.foreign_key.to_sym unless association.belongs_to?
       model.reflect_on_all_associations.each do |current|
-        if !current.belongs_to? && association.primary_key_name == current.association_foreign_key
+        if !current.belongs_to? && association.foreign_key == current.association_foreign_key
           constrained_fields << current.name.to_sym
           @child_association = current if current.klass == @parent_model
         end
-        if association.primary_key_name == current.primary_key_name
+        if association.foreign_key == current.foreign_key
           # show columns for has_many and has_one child associationes
           constrained_fields << current.name.to_sym if current.belongs_to? 
           @child_association = current

data/lib/active_scaffold/data_structures/sorting.rb

@@ -9,7 +9,7 @@ module ActiveScaffold::DataStructures
     end
     
     def set_default_sorting(model)
-      model_scope = model.send(:current_scoped_methods)
+      model_scope = model.send(:build_default_scope)
       order_clause = model_scope.arel.order_clauses.join(",") if model_scope
 
       # If an ORDER BY clause is found set default sorting according to it, else

data/lib/active_scaffold/engine.rb

@@ -0,0 +1,8 @@
+module ActiveScaffold
+  #do not use module Rails... cause Rails.logger will fail
+  # not sure if it is a must though...
+  #module Rails
+    class Engine < ::Rails::Engine
+    end
+  #end
+end

data/lib/active_scaffold/extensions/action_controller_rendering.rb

@@ -0,0 +1,22 @@
+# wrap the action rendering for ActiveScaffold controllers
+module ActionController #:nodoc:
+  class Base
+    def render_with_active_scaffold(*args, &block)
+      if self.class.uses_active_scaffold? and params[:adapter] and @rendering_adapter.nil?
+        @rendering_adapter = true # recursion control
+        # if we need an adapter, then we render the actual stuff to a string and insert it into the adapter template
+        opts = args.blank? ? Hash.new : args.first
+        render :partial => params[:adapter][1..-1],
+        :locals => {:payload => render_to_string(opts.merge(:layout => false), &block).html_safe},
+               :use_full_path => true, :layout => false
+        @rendering_adapter = nil # recursion control
+      else
+        render_without_active_scaffold(*args, &block)
+      end
+    end
+    alias_method_chain :render, :active_scaffold
+
+    # Rails 2.x implementation is post-initialization on :active_scaffold method
+  end
+end
+