active_scaffold-sequel 0.3.0 → 0.4.0

data/app/assets/stylesheets/active_scaffold_images.css.scss

@@ -15,18 +15,15 @@ background-image: image-url('active_scaffold/add.gif');
 background-image: image-url('active_scaffold/magnifier.png');
 }
 
-.active-scaffold th.asc a,
-.active-scaffold th.asc a:hover {
+.active-scaffold th.asc a {
 background-image: image-url('active_scaffold/arrow_up.gif');
 }
 
-.active-scaffold th.desc a,
-.active-scaffold th.desc a:hover {
+.active-scaffold th.desc a {
 background-image: image-url('active_scaffold/arrow_down.gif');
 }
 
-.active-scaffold th.loading a,
-.active-scaffold th.loading a:hover {
+.active-scaffold th.loading a {
 background-image: image-url('active_scaffold/indicator-small.gif');
 }
 

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -172,11 +172,8 @@ padding-right: 18px;
 }
 
 .active-scaffold th.asc a,
-.active-scaffold th.asc a:hover,
 .active-scaffold th.desc a,
-.active-scaffold th.desc a:hover,
-.active-scaffold th.loading a,
-.active-scaffold th.loading a:hover {
+.active-scaffold th.loading a {
   background: right 50% no-repeat;
 }
 

data/frontends/default/views/_field_search.html.erb

@@ -25,7 +25,7 @@ form_tag url_options, options %>
   </ol>
   <p class="form-footer">
     <%= submit_tag as_(:search), :class => "submit" %>
-    <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel', :remote => true %>
+    <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel', :remote => true, :data => {:refresh => true} %>
     <%= loading_indicator_tag(:action => :search) %>
   </p>
 </form>

data/frontends/default/views/_form_association.html.erb

@@ -1,7 +1,7 @@
 <%
 parent_record = @record
 associated = column.singular_association? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).to_a
-associated = associated.sort_by {|r| r.new? ? 99999999999 : r.id} unless parent_record.send("#{column.name}_dataset").opts.has_key?(:order)
+associated = associated.sort_by {|r| r.new? ? 99999999999 : r.id} unless column.association[:order]
 if show_blank_record = column.show_blank_record?(associated)
   associated << build_associated(column, parent_record)
 end

data/frontends/default/views/_form_attribute.html.erb

@@ -8,7 +8,7 @@
     <%=raw active_scaffold_input_for column, scope %>
     <% else %>
     <%= get_column_value(@record, column) %>
-    <%= hidden_field :record, column.association ? column.association.primary_key_name : column.name, active_scaffold_input_options(column, scope) -%>
+    <%= hidden_field :record, column.association ? (column.association[:key] || column.association[:left_key]) : column.name, active_scaffold_input_options(column, scope) -%>
     <% end %>
     <% if column.update_columns -%>
       <%= loading_indicator_tag(:action => :render_field, :id => params[:id]) %>

data/frontends/default/views/_search.html.erb

@@ -9,7 +9,7 @@ options['data-loading'] = true unless live_search
   form_tag url_options, options %>
   <%= text_field_tag :search, search_params, :class => 'text-input', :id => search_input_id, :size => 50, :autocomplete => :off %>
   <%= submit_tag as_(:search), :class => "submit" %>
-  <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel', :remote => true %>
+  <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel', :remote => true, :data => {:refresh => true} %>
   <%= loading_indicator_tag(:action => :search) %>
 </form>
 

data/lib/active_scaffold/actions/core.rb

@@ -139,11 +139,21 @@ module ActiveScaffold::Actions
       {}
     end
   
-    #Overide this method on your controller to provide model with named scopes
+    # Overide this method on your controller to provide model with named scopes
+    # This method returns a model class or a dataset.
     def beginning_of_chain
       active_scaffold_config.model
     end
-        
+
+    # This method returns a model class.
+    def origin_class
+      active_scaffold_config.model
+    end
+
+    def origin_class_with_build_options
+      [origin_class, {}]
+    end
+
     # Builds search conditions by search params for column names. This allows urls like "contacts/list?company_id=5".
     def conditions_from_params
       conditions = nil
@@ -155,15 +165,17 @@ module ActiveScaffold::Actions
     end
 
     def new_model
-      model = beginning_of_chain
+      model, build_options = origin_class_with_build_options
       if model.respond_to?(:sti_key)
-        build_options = {model.sti_key => active_scaffold_config.model_id} if nested? && nested.association && nested.association.collection?
+        build_options[model.sti_key] = active_scaffold_config.model_id if nested? && nested.association && nested.association.collection?
         sti_key = model.sti_key.to_s
-        params = self.params # in new action sti_key must be in params
-        params = params[:record] || {} unless params[sti_key] # in create action must be inside record key
-        model = params.delete(sti_key).camelize.constantize if params[sti_key]
+        if params[sti_key]  # in new action sti_key must be in params
+          model = params[sti_key].constantize
+        elsif params[:record] and params[:record][sti_key]  # in create action must be inside record key
+          model = params[:record][sti_key].constantize
+        end
       end
-      model.respond_to?(:build) ? model.build(build_options || {}) : model.new
+      model.new(build_options)
     end
 
     private

data/lib/active_scaffold/actions/create.rb

@@ -83,7 +83,6 @@ module ActiveScaffold::Actions
       @record = new_model
       apply_constraints_to_record(@record)
       if nested?
-        create_association_with_parent(@record)
         register_constraints_with_action_columns(nested.constrained_fields)
       end
       @record
@@ -92,28 +91,18 @@ module ActiveScaffold::Actions
     # A somewhat complex method to actually create a new record. The complexity is from support for subforms and associated records.
     # If you want to customize this behavior, consider using the +before_create_save+ and +after_create_save+ callbacks.
     def do_create
-      begin
-        active_scaffold_config.model.db.transaction do
-          @record = update_record_from_params(new_model, active_scaffold_config.create.columns, params[:record])
-          apply_constraints_to_record(@record, :allow_autosave => true)
-          if nested?
-            create_association_with_parent(@record) 
-            register_constraints_with_action_columns(nested.constrained_fields)
-          end
-          create_save
-        end
-      rescue ActiveRecord::RecordInvalid
-        flash[:error] = $!.message
-        self.successful = false
-      end
-    end
-
-    def create_save
-      before_create_save(@record)
-      self.successful = [@record.valid?, @record.associated_valid?].all? {|v| v == true} # this syntax avoids a short-circuit
-      if successful?
-        @record.save! and @record.save_associated!
+      active_scaffold_config.model.db.transaction do
+        @record = update_record_from_params(new_model, active_scaffold_config.create.columns, params[:record])
+        apply_constraints_to_record(@record, :allow_autosave => true)
+        before_create_save(@record)
+        @record.raise_on_save_failure = false
+        self.successful = @record.save
+        raise Sequel::Rollback unless successful?
         after_create_save(@record)
+        if nested?
+          create_association_with_parent(@record) 
+          register_constraints_with_action_columns(nested.constrained_fields)
+        end
       end
     end
 

data/lib/active_scaffold/actions/list.rb

@@ -92,13 +92,12 @@ module ActiveScaffold::Actions
 
     def each_record_in_scope
       do_search if respond_to? :do_search
-      finder_options = { :order => "#{active_scaffold_config.model.connection.quote_table_name(active_scaffold_config.model.table_name)}.#{active_scaffold_config.model.primary_key} ASC",
+      finder_options = {:order => "#{active_scaffold_config.model.table_name}__#{active_scaffold_config.model.primary_key}".to_sym,
         :conditions => all_conditions,
         :joins => joins_for_finder}
       finder_options.merge! custom_finder_options
-      finder_options.merge! :include => (active_scaffold_includes.blank? ? nil : active_scaffold_includes)
-      klass = beginning_of_chain
-      klass.all(finder_options).each {|record| yield record}
+      finder_options.merge! :includes => (active_scaffold_includes.blank? ? nil : active_scaffold_includes)
+      append_to_query(beginning_of_chain.dataset, finder_options).all.each {|record| yield record}
     end
 
     # The default security delegates to ModelPermissions.

data/lib/active_scaffold/actions/nested.rb

@@ -24,7 +24,7 @@ module ActiveScaffold::Actions
     end
     
     def set_nested
-      if params[:parent_scaffold] && (params[:association] || params[:named_scope])
+      if params[:parent_scaffold] && params[:association]
         @nested = ActiveScaffold::DataStructures::NestedInfo.get(active_scaffold_config.model, params)
         unless @nested.nil?
           active_scaffold_constraints[:id] = params[:id] if @nested.belongs_to?
@@ -76,19 +76,33 @@ module ActiveScaffold::Actions
     end
     
     def beginning_of_chain
-      if nested? && nested.association && !nested.association.belongs_to?
-        if nested.association.collection?
-          nested.parent_scope.send(nested.association[:name])
-        elsif nested.child_association.belongs_to?
-          active_scaffold_config.model.where(nested.child_association.foreign_key => nested.parent_scope)
+      if nested? && nested.association && !(nested.association[:type] == :many_to_one)
+        if nested.association.returns_array?
+          nested.parent_scope.send("#{nested.association[:name]}_dataset")
+        elsif nested.child_association[:type] == :many_to_one
+          active_scaffold_config.model.where((nested.child_association[:key] || nested.child_association[:left_key]) => nested.parent_id)
         end
-      elsif nested? && nested.scope
-        nested.parent_scope.send(nested.scope)
       else
         active_scaffold_config.model
       end
     end
 
+    def origin_class
+      origin_class_with_build_options[0]
+    end
+
+    def origin_class_with_build_options
+      if nested? && nested.association && !(nested.association[:type] == :many_to_one)
+        if nested.association.returns_array?
+          [nested.association.associated_class, {nested.association.reciprocal => nested.parent_scope}]
+        elsif nested.child_association[:type] == :many_to_one
+          [active_scaffold_config.model, {(nested.child_association[:key] || nested.child_association[:left_key]) => nested.parent_id}]
+        end
+      else
+        [active_scaffold_config.model, {}]
+      end
+    end
+
     def nested_parent_record(crud = :read)
       @nested_parent_record ||= find_if_allowed(nested.parent_id, crud, nested.parent_model)
     end
@@ -203,7 +217,7 @@ module ActiveScaffold::Actions::Nested
     end
  
     def after_create_save(record)
-      if params[:association_macro] == :has_and_belongs_to_many
+      if nested and nested.habtm?
         params[:associated_id] = record
         do_add_existing
       end
@@ -212,10 +226,9 @@ module ActiveScaffold::Actions::Nested
     # The actual "add_existing" algorithm
     def do_add_existing
       parent_record = nested_parent_record(:update)
-      @record = active_scaffold_config.model.find(params[:associated_id])
+      @record = active_scaffold_config.model[params[:associated_id]]
       if parent_record && @record
-        parent_record.send(nested.association[:name]) << @record
-        parent_record.save
+        parent_record.send("add_#{nested.association[:name].to_s.singularize}", @record)
       else
         false
       end
@@ -224,9 +237,7 @@ module ActiveScaffold::Actions::Nested
     def do_destroy_existing
       if active_scaffold_config.nested.shallow_delete
         @record = nested_parent_record(:update)
-        collection = @record.send(nested.association[:name])
-        assoc_record = collection.find(params[:id])
-        collection.delete(assoc_record)
+        @record.send("remove_#{nested.association[:name].to_s.singularize}", params[:id])
       else
         do_destroy
       end

data/lib/active_scaffold/actions/update.rb

@@ -81,25 +81,18 @@ module ActiveScaffold::Actions
         active_scaffold_config.model.db.transaction do
           @record = update_record_from_params(@record, active_scaffold_config.update.columns, params[:record]) unless options[:no_record_param_update]
           before_update_save(@record)
-          self.successful = [@record.valid?, @record.associated_valid?].all? {|v| v == true} # this syntax avoids a short-circuit
-          if successful?
-            @record.save! and @record.save_associated!
-            after_update_save(@record)
-          else
-            # some associations such as habtm are saved before saved is called on parent object
-            # we have to revert these changes if validation fails
-            raise Sequel::Rollback, "don't save habtm associations unless record is valid"
-          end
+          @record.raise_on_save_failure = false
+          self.successful = @record.save
+          raise Sequel::Rollback unless successful?
+          after_update_save(@record)
+        end
+      rescue Sequel::Error => err
+        if Sequel::Plugins.const_defined?(:OptimisticLocking) and err.kind_of?(Sequel::Plugins::OptimisticLocking::Error)
+          @record.errors.add(:base, as_(:version_inconsistency))
+          self.successful = false
+        else
+          raise err
         end
-      rescue ActiveRecord::RecordInvalid
-        flash[:error] = $!.message
-        self.successful = false
-      rescue ActiveRecord::StaleObjectError
-        @record.errors.add(:base, as_(:version_inconsistency))
-        self.successful = false
-      rescue ActiveRecord::RecordNotSaved
-        @record.errors.add(:base, as_(:record_not_saved)) if @record.errors.empty?
-        self.successful = false
       end
     end
 

data/lib/active_scaffold/attribute_params.rb

@@ -55,12 +55,12 @@ module ActiveScaffold
 
         if multi_parameter_attributes.has_key? column.name
           parent_record.send(:assign_multiparameter_attributes, multi_parameter_attributes[column.name])
-        elsif attributes.has_key? column.name
-          value = column_value_from_param_value(parent_record, column, attributes[column.name]) 
-
+        elsif column.nested and attributes.has_key? column.nested_attribute_name
+          parent_record.send("#{column.nested_attribute_name}=", attributes[column.nested_attribute_name])
+        elsif attributes.has_key? column.name.to_s
+          value = column_value_from_param_value(parent_record, column, attributes[column.name.to_s]) 
           # we avoid assigning a value that already exists because otherwise has_one associations will break (AR bug in has_one_association.rb#replace)
           parent_record.send("#{column.name}=", value) unless parent_record.send(column.name) == value
-          
         elsif column.plural_association? and not parent_record.new?
           parent_record.send("remove_all_#{column.name}")
         end
@@ -80,7 +80,7 @@ module ActiveScaffold
 
       parent_record
     end
-    
+
     def manage_nested_record_from_params(parent_record, column, attributes)
       record = find_or_create_for_params(attributes, column, parent_record)
       if record
@@ -157,7 +157,7 @@ module ActiveScaffold
     def find_or_create_for_params(params, parent_column, parent_record)
       current = parent_record.send(parent_column.name)
       klass = parent_column.association.associated_class
-      pk = klass.primary_key.to_sym
+      pk = klass.primary_key
       return nil if parent_column.show_blank_record?(current) and attributes_hash_is_empty?(params, klass)
 
       if params.has_key? pk

data/lib/active_scaffold/config/nested.rb

@@ -26,15 +26,8 @@ module ActiveScaffold::Config
         action_link = @core.link_for_association(column, options)
         action_link.action ||= :index
         @core.action_links.add_to_group(action_link, action_group) unless action_link.nil?
-      else
-        
       end
     end
-    
-    def add_scoped_link(named_scope, options = {})
-      action_link = @core.link_for_association_as_scope(named_scope.to_sym, options)
-      @core.action_links.add_to_group(action_link, action_group) unless action_link.nil?
-    end
 
     # the label for this Nested action. used for the header.
     attr_writer :label

data/lib/active_scaffold/data_structures/action_link.rb

@@ -165,15 +165,8 @@ module ActiveScaffold::DataStructures
     
     # nested action_links are referencing a column
     attr_accessor :column
-    
-    # indicates that this a nested_link
-    def nested_link?
-      @column || (parameters && parameters[:named_scope])
-    end
-    
+
     # Internal use: generated eid for this action_link
     attr_accessor :eid
-    
-    
   end
 end

data/lib/active_scaffold/data_structures/column.rb

@@ -220,6 +220,13 @@ module ActiveScaffold::DataStructures
     cattr_accessor :association_form_ui
     @@association_form_ui = nil
 
+    # boolean: true if the column is for a nested association, otherwise nil
+    attr_accessor :nested
+
+    def nested_attribute_name
+      @nested_attribute_name ||= "#{name}_attributes"
+    end
+
     # ----------------------------------------------------------------- #
     # the below functionality is intended for internal consumption only #
     # ----------------------------------------------------------------- #
@@ -270,6 +277,7 @@ module ActiveScaffold::DataStructures
       self.name = name
       @column = active_record_class.db_schema[name]
       @association = active_record_class.association_reflection(name)
+      @nested = true if @association and @association[:nested_attributes]
       @autolink = !@association.nil?
       @active_record_class = active_record_class
       @table = active_record_class.table_name

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -3,72 +3,40 @@ module ActiveScaffold::DataStructures
     def self.get(model, params)
       nested_info = {}
       begin
-        nested_info[:name] = (params[:association] || params[:named_scope]).to_sym
+        nested_info[:name] = params[:association].to_sym
         nested_info[:parent_scaffold] = "#{params[:parent_scaffold].to_s.camelize}Controller".constantize
         nested_info[:parent_model] = nested_info[:parent_scaffold].active_scaffold_config.model
         nested_info[:parent_id] = params[nested_info[:parent_model].name.foreign_key]
         if nested_info[:parent_id]
-          unless params[:association].nil?
-            ActiveScaffold::DataStructures::NestedInfoAssociation.new(model, nested_info)
-          else
-            ActiveScaffold::DataStructures::NestedInfoScope.new(model, nested_info)
-          end
+          ActiveScaffold::DataStructures::NestedInfo.new(model, nested_info)
         end
       rescue ActiveScaffold::ControllerNotFound
         nil
       end
     end
     
-    attr_accessor :association, :child_association, :parent_model, :parent_scaffold, :parent_id, :constrained_fields, :scope
+    attr_accessor :association, :child_association, :parent_model, :parent_scaffold, :parent_id, :constrained_fields
         
     def initialize(model, nested_info)
       @parent_model = nested_info[:parent_model]
       @parent_id = nested_info[:parent_id]
       @parent_scaffold = nested_info[:parent_scaffold]
+      @association = @parent_model.association_reflection(nested_info[:name])
+      iterate_model_associations(model)
     end
     
     def to_params
-      {:parent_scaffold => parent_scaffold.controller_path}
-    end
-    
-    def new_instance?
-      result = @new_instance.nil?
-      @new_instance = false
-      result
+      {:parent_scaffold => parent_scaffold.controller_path, :association => association[:name], :assoc_id => parent_id}
     end
-    
+
     def parent_scope
-      parent_model.find(parent_id)
-    end
-    
-    def habtm?
-      false 
-    end
-    
-    def belongs_to?
-      false
+      parent_model[parent_id]
     end
 
-    def has_one?
-      false
-    end
-    
-    def sorted?
-      false
-    end
-  end
-  
-  class NestedInfoAssociation < NestedInfo
-    def initialize(model, nested_info)
-      super(model, nested_info)
-      @association = parent_model.association_reflection(nested_info[:name])
-      iterate_model_associations(model)
-    end
-    
     def name
-      self.association[:name]
+      association[:name]
     end
-    
+
     def habtm?
       association[:type] == :many_to_many
     end
@@ -89,10 +57,6 @@ module ActiveScaffold::DataStructures
       association[:order]
     end
     
-    def to_params
-      super.merge(:association => @association[:name], :assoc_id => parent_id)
-    end
-    
     protected
     
     def iterate_model_associations(model)
@@ -111,20 +75,4 @@ module ActiveScaffold::DataStructures
       end
     end
   end
-  
-  class NestedInfoScope < NestedInfo
-    def initialize(model, nested_info)
-      super(model, nested_info)
-      @scope = nested_info[:name]
-      @constrained_fields = [] 
-    end
-    
-    def to_params
-      super.merge(:named_scope => @scope)
-    end
-    
-    def name
-      self.scope
-    end
-  end
 end

data/lib/active_scaffold/extensions/routing_mapper.rb

@@ -35,13 +35,6 @@ module ActionDispatch
             resources(resource, options.merge(:parent_scaffold => merge_module_scope(@scope[:module], parent_resource.plural), :association => resource)) { yield if block_given? }
           end
         end
-        
-        def as_scoped_routes(*scopes)
-          options = scopes.extract_options!
-          scopes.each do |scope|
-            resources(scope, options.merge(:parent_scaffold => merge_module_scope(@scope[:module], parent_resource.plural), :named_scope => scope, :controller => parent_resource.plural)) { yield if block_given? }
-          end
-        end
       end
     end
   end

data/lib/active_scaffold/finder.rb

@@ -240,7 +240,7 @@ module ActiveScaffold
     # returns a single record (the given id) but only if it's allowed for the specified action.
     # accomplishes this by checking model.#{action}_authorized?
     # TODO: this should reside on the model, not the controller
-    def find_if_allowed(id, crud_type, klass = beginning_of_chain)
+    def find_if_allowed(id, crud_type, klass = origin_class)
       record = klass[id]
       raise ActiveScaffold::RecordNotAllowed, "#{klass} with id = #{id}" unless record.authorized_for?(:crud_type => crud_type.to_sym)
       return record

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -289,10 +289,11 @@ module ActiveScaffold
       end
 
       def column_scope(column)
+        name = column.nested ? column.nested_attribute_name : column.name
         if column.plural_association?
-          "[#{column.name}][#{@record.id || generate_temporary_id}]"
+          "[#{name}][#{@record.id || generate_temporary_id}]"
         else
-          "[#{column.name}]"
+          "[#{name}]"
         end
       end
 

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -33,7 +33,7 @@ module ActiveScaffold
       def render_list_column(text, column, record)
         if column.link
           link = column.link
-          associated = record.send(column.association[:name]) if column.association
+          associated = column.association ? record.send(column.association[:name]) : nil
           url_options = params_for(:action => nil, :id => record.id)
 
           # setup automatic link
@@ -49,8 +49,9 @@ module ActiveScaffold
           else
             "<a class='disabled'>#{text}</a>".html_safe
           end
+        elsif inplace_edit?(record, column)
+          active_scaffold_inplace_edit(record, column, {:formatted_column => text})
         else
-          text = active_scaffold_inplace_edit(record, column, {:formatted_column => text}) if inplace_edit?(record, column)
           text
         end
       end
@@ -325,7 +326,7 @@ module ActiveScaffold
       def render_nested_view(action_links, url_options, record)
         rendered = []
         action_links.member.each do |link|
-          if link.nested_link? && link.column && @nested_auto_open[link.column.name] && @records.length <= @nested_auto_open[link.column.name] && controller.respond_to?(:render_component_into_view)
+          if link.column && @nested_auto_open[link.column.name] && @records.length <= @nested_auto_open[link.column.name] && controller.respond_to?(:render_component_into_view)
             link_url_options = {:adapter => '_list_inline_adapter', :format => :js}.merge(action_link_url_options(link, url_options, record, options = {:reuse_eid => true})) 
             link_id = get_action_link_id(link_url_options, record, link.column)
             rendered << (controller.send(:render_component_into_view, link_url_options) + javascript_tag("ActiveScaffold.ActionLink.get('#{link_id}').set_opened();"))

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -133,7 +133,7 @@ module ActiveScaffold
       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.primary_key_name].column.try(:null)
+          column.association.macro != :belongs_to || active_scaffold_config.columns[column.association[:key] || column.association[:left_key]].column.try(:null)
         else
           column.column.try(:null)
         end
@@ -153,7 +153,7 @@ module ActiveScaffold
       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.primary_key_name].column.try(:null)
+          column.association.macro != :belongs_to || active_scaffold_config.columns[column.association[:key] || column.association[:left_key]].column.try(:null)
         else
           column.column.try(:null)
         end

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -119,7 +119,7 @@ module ActiveScaffold
         @link_record = record
         url_options.merge! self.instance_eval(&(link.dynamic_parameters)) if link.dynamic_parameters.is_a?(Proc)
         @link_record = nil
-        url_options_for_nested_link(link.column, record, link, url_options, options) if link.nested_link?
+        url_options_for_nested_link(link.column, record, link, url_options, options) if link.column
         url_options_for_sti_link(link.column, record, link, url_options, options) unless record.nil? || active_scaffold_config.sti_children.nil?
         url_options[:_method] = link.method if !link.confirm? && link.inline? && link.method != :get
         url_options
@@ -183,8 +183,6 @@ module ActiveScaffold
         if column && column.association 
           url_options[column.association[:model].name.foreign_key.to_sym] = url_options.delete(:id)
           url_options[:id] = record.send(column.association[:name]).id if column.singular_association? && record.send(column.association[:name]).present?
-        elsif link.parameters && link.parameters[:named_scope]
-          url_options[active_scaffold_config.model.name.foreign_key.to_sym] = url_options.delete(:id)
         end
       end
 
@@ -241,14 +239,14 @@ module ActiveScaffold
       end
 
       def column_calculation(column)
-        unless column.calculate.instance_of? Proc
+        if column.calculate.instance_of? Proc
+          column.calculate.call(@records)
+        else
           conditions = controller.send(:all_conditions)
           includes = active_scaffold_config.list.count_includes
           includes ||= controller.send(:active_scaffold_includes) unless conditions.nil?
-          calculation = beginning_of_chain.calculate(column.calculate, column.name, :conditions => conditions,
-           :joins => controller.send(:joins_for_collection), :include => includes)
-        else
-          column.calculate.call(@records)
+          controller.send(:append_to_query, beginning_of_chain.dataset, :where => conditions, :includes => includes,
+            :joins => controller.send(:joins_for_collection)).get(column.calculate.sql_function(column.name))
         end
       end
 

data/lib/active_scaffold/version.rb

@@ -1,7 +1,7 @@
 module ActiveScaffold
   module Version
     MAJOR = 0
-    MINOR = 3
+    MINOR = 4
     PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')