active_scaffold 3.0.2 → 3.0.4

data/CHANGELOG

@@ -1,3 +1,13 @@
+= 3.0.4
+
+- Fix a typo that made 3.0.3 unusable.
+
+= 3.0.3
+
+- Fixing 'require' ordering
+- Code for nested and subgrouped action links
+- bugfixes for better html generation
+
 = 3.0.2
 
 - Two bug fixes and a deprecation silencing.

data/active_scaffold.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "active_scaffold"
-  s.version     = "3.0.2"
+  s.version     = "3.0.4"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Many, see README"]
   s.email       = ["activescaffold@googlegroups.com"]

data/environment.rb

@@ -3,9 +3,11 @@ require 'active_scaffold'
 # TODO: clean up extensions. some could be organized for autoloading, and others could be removed entirely.
 Dir["#{File.dirname __FILE__}/lib/extensions/*.rb"].each { |file| require file }
 #Dir["#{File.dirname __FILE__}/lib/generators/*/*.rb"].each { |file| require file }
-Dir["#{File.dirname __FILE__}/lib/active_scaffold/actions/*.rb"].each { |file| require file }
+require "#{File.dirname __FILE__}/lib/active_scaffold/data_structures/set.rb"
 Dir["#{File.dirname __FILE__}/lib/active_scaffold/data_structures/*.rb"].each { |file| require file }
+Dir["#{File.dirname __FILE__}/lib/active_scaffold/actions/*.rb"].each { |file| require file }
 Dir["#{File.dirname __FILE__}/lib/active_scaffold/config/*.rb"].each { |file| require file }
+require "#{File.dirname __FILE__}/lib/active_scaffold/helpers/id_helpers.rb"
 Dir["#{File.dirname __FILE__}/lib/active_scaffold/helpers/*.rb"].each { |file| require file }
 
 ActionController::Base.send(:include, ActiveScaffold)

data/frontends/default/stylesheets/stylesheet.css

@@ -246,7 +246,6 @@ text-align: right;
 
 /* Table :: Actions (Edit, Delete)
    ============================= */
-
 .active-scaffold tr.record td.actions {
 border-right: solid 1px #ccc;
 padding: 0;

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

@@ -8,7 +8,7 @@
   <%= render :partial => 'list_messages', :locals => {:columns => columns} %>
   <tbody class="records" id="<%= active_scaffold_tbody_id %>">
     <% if !@records.empty? -%>
-      <%= render :partial => 'list_record', :collection => @page.items, :locals => { :hidden => false, :columns => columns, :action_links => active_scaffold_config.action_links.collect_by_type(:member)} %>
+      <%= render :partial => 'list_record', :collection => @page.items, :locals => { :hidden => false, :columns => columns, :action_links => active_scaffold_config.action_links.member} %>
     <% end -%>
     <% if columns.any? {|c| c.calculation?} -%>
       <%= render :partial => 'list_calculations', :locals => {:columns => columns} %>

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

@@ -1,15 +1,22 @@
-<% action_links ||= active_scaffold_config.action_links %>
+<% action_links ||= active_scaffold_config.action_links.member %>
 <td class="actions"><table cellpadding="0" cellspacing="0">
   <tr>
     <td class="indicator-container">
       <%= loading_indicator_tag(:action => :record, :id => record.id) %>
     </td>
-    <% action_links.each do |link| -%>
-      <% next if skip_action_link(link, record) -%>
-      <td>
-      <%= record.authorized_for?(:crud_type => link.crud_type, :action => link.action) ? render_action_link(link, url_options, record) : action_link_html(link, nil, {:class => "disabled #{link.action}#{link.html_options[:class].blank? ? '' : (' ' + link.html_options[:class])}"}) %>
-      </td>
-    <% end -%>
+      <% level = 0 %>
+      <% action_links.traverse(controller, {:record => record}) do |parent, link, options| -%>
+        <% tag = (level == 0 ? 'td' : 'li') %>
+        <% if (options[:node] == :finished_traversing) -%>
+          <% level -= 1 %>
+          <%= "</ul></#{(level == 0 ? 'td' : 'li')}>".html_safe %>
+        <% elsif (options[:node] == :start_traversing) -%>
+          <%= "<#{tag} #{"class=\"action_list\"" if tag == 'td'}> #{content_tag('span', parent.name)}<ul>".html_safe %>
+          <% level += 1 %>
+        <% else -%>
+          <%= content_tag(tag, options[:authorized] ? render_action_link(link, url_options, record) : action_link_html(link, nil, {:class => "disabled #{link.action}#{link.html_options[:class].blank? ? '' : (' ' + link.html_options[:class])}"})) %>
+        <% end -%>
+      <% end -%>
   </tr>
 </table>
 </td>

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

@@ -2,7 +2,7 @@
    columns ||= list_columns -%>
 <tr id="<%= active_scaffold_calculations_id %>" class="active-scaffold-calculations">
   <% columns.each do |column| -%>
-    <td id="<%= active_scaffold_calculations_id(column) if column.calculation? %>">
+    <td <%= "id=#{active_scaffold_calculations_id(column)}" if column.calculation? %>>
       <% if column.calculation? -%>
         <%= render_column_calculation(column) %>
       <% else -%>

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

@@ -1,4 +1,4 @@
-<% action_links = active_scaffold_config.action_links.collect_by_type(:collection) 
+<% action_links = active_scaffold_config.action_links.collection.collect
   unless action_links.empty? -%>
   <div class="actions">
     <% new_params = params_for %>

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

@@ -21,7 +21,7 @@
       record = active_scaffold_config.model.new
       record.id = 0
       action_links.add(search_link)  -%>
-      <%= render :partial => 'list_actions', :locals => {:record => record, :url_options => params_for(:escape => false, :search => ''), :action_links => action_links} %>
+      <%= render :partial => 'list_actions', :locals => {:record => record, :url_options => params_for(:escape => false, :search => ''), :action_links => action_links.member} %>
     <% else %>
       <td class='actions'><%= '<p class="empty-message">&nbsp;</p>'.html_safe if @page.items.empty? %></td>
     <% end -%>

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

@@ -4,7 +4,7 @@ columns ||= list_columns
 tr_class = cycle("", "even-record")
 tr_class += " #{list_row_class(record)}" if respond_to? :list_row_class
 url_options = params_for(:action => :list, :id => record.id)
-action_links ||= active_scaffold_config.action_links.collect_by_type(:member)
+action_links ||= active_scaffold_config.action_links.member
 -%>
 
 <tr class="record <%= tr_class %>" id="<%= element_row_id(:action => :list, :id => record.id) %>" data-refresh="<%= url_for(params_for(:action => :row, :id => record.id, :_method => :get, :escape => false)).html_safe %>">

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

@@ -1,6 +1,6 @@
 <div class="active-scaffold-header">
   <div class="actions">
-    <% active_scaffold_config.action_links.each :member do |link| -%>
+    <% active_scaffold_config.action_links.member.each do |link| -%>
       <% next unless link.action == 'nested' -%>
       <% next if skip_action_link(link) -%>
       <%= record.authorized_for?(:crud_type => link.crud_type, :action => link.action) ? render_action_link(link, url_options, record) : "<a class='disabled'>#{link.label}</a>" -%>

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

@@ -1,6 +1,6 @@
 <div class="active-scaffold">
   <div class="update-view <%= "#{params[:controller]}-view" %> view">
-    <% if active_scaffold_config.update.nested_links and active_scaffold_config.action_links.any? {|link| link.type == :member } -%>
+    <% if active_scaffold_config.update.nested_links and active_scaffold_config.action_links.member.empty? -%>
     <%= render :partial => 'update_actions', :locals => {:record => @record, :url_options => params_for(:action => :list, :id => @record.id)} %>
     <% end -%>
     <%= render :partial => 'update_form' -%>

data/lib/active_scaffold/config/base.rb

@@ -33,17 +33,17 @@ module ActiveScaffold::Config
         @conf = conf
       end
     end
-    
+
     def formats
       @formats ||= []
     end
-    
+
     def formats=(val)
       @formats=val
     end
-    
+
     private
-    
+
     def columns=(val)
       @columns = ActiveScaffold::DataStructures::ActionColumns.new(*val)
       @columns.action = self

data/lib/active_scaffold/config/create.rb

@@ -33,7 +33,7 @@ module ActiveScaffold::Config
       model ||= @core.label(:count => 1)
       @label ? as_(@label) : as_(:create_model, :model => model)
     end
-    
+
     # whether the form stays open after a create or not
     attr_accessor :persistent
 

data/lib/active_scaffold/config/field_search.rb

@@ -49,26 +49,26 @@ module ActiveScaffold::Config
     # * false: LIKE ?
     # Default is :full
     attr_accessor :text_search
-    
+
     # the ActionLink for this action
     attr_accessor :link
-    
+
     # rarely searched columns may be placed in a hidden subgroup
      def optional_columns=(optionals)
       @optional_columns= Array(optionals)
     end
-    
+
     def optional_columns
       @optional_columns ||= []
     end
-    
+
     # default search params
-    # default_params = {:title => {"from"=>"test", "to"=>"", "opt"=>"%?%"}} 
+    # default_params = {:title => {"from"=>"test", "to"=>"", "opt"=>"%?%"}}
     attr_accessor :default_params
-    
+
     # human conditions
     # instead of just filtered you may show the user a humanized search condition statment
     attr_accessor :human_conditions
-    
+
   end
 end

data/lib/active_scaffold/config/form.rb

@@ -34,9 +34,9 @@ module ActiveScaffold::Config
       end
       @columns
     end
-    
+
     public :columns=
-    
+
     # whether the form should be multipart
     attr_writer :multipart
     def multipart?

data/lib/active_scaffold/config/mark.rb

@@ -1,22 +1,22 @@
 module ActiveScaffold::Config
   class Mark < Base
     self.crud_type = :read
-    
+
     def initialize(core_config)
       @core = core_config
       @core.model.send(:include, ActiveScaffold::MarkedModel) unless @core.model.ancestors.include?(ActiveScaffold::MarkedModel)
       add_mark_column
     end
-    
+
     protected
-    
+
     def add_mark_column
       @core.columns.add :marked
       @core.columns[:marked].label = 'M'
       @core.columns[:marked].form_ui = :checkbox
       @core.columns[:marked].inplace_edit = true
       @core.columns[:marked].sort = false
-      @core.list.columns = [:marked] + @core.list.columns.names unless @core.list.columns.include? :marked 
+      @core.list.columns = [:marked] + @core.list.columns.names unless @core.list.columns.include? :marked
     end
   end
 end

data/lib/active_scaffold/config/nested.rb

@@ -20,14 +20,14 @@ module ActiveScaffold::Config
     def add_link(attribute, options = {})
       column = @core.columns[attribute.to_sym]
       unless column.nil? || column.association.nil?
-        options.reverse_merge! :security_method => :nested_authorized?, :label => column.association.klass.model_name.human({:count => 2, :default => column.association.klass.name.pluralize}) 
+        options.reverse_merge! :security_method => :nested_authorized?, :label => column.association.klass.model_name.human({:count => 2, :default => column.association.klass.name.pluralize})
         action_link = @core.link_for_association(column, options)
         @core.action_links.add(action_link) 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(action_link) unless action_link.nil?

data/lib/active_scaffold/config/show.rb

@@ -28,7 +28,7 @@ module ActiveScaffold::Config
       self.columns = @core.columns._inheritable unless @columns # lazy evaluation
       @columns
     end
-    
+
     public :columns=
   end
 end

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -15,7 +15,7 @@ module ActiveScaffold::DataStructures
 
     # Whether this column set is collapsed by default in contexts where collapsing is supported
     attr_accessor :collapsed
-    
+
     # nests a subgroup in the column set
     def add_subgroup(label, &proc)
       columns = ActiveScaffold::DataStructures::ActionColumns.new
@@ -73,7 +73,7 @@ module ActiveScaffold::DataStructures
           end
         end
       end
-      
+
       def collect_visible(options = {}, &proc)
         columns = []
         options[:for] ||= @columns.active_record_class
@@ -90,8 +90,8 @@ module ActiveScaffold::DataStructures
           end
         end
         columns
-      end      
-      
+      end
+
       def skip_column?(column, options)
         result = false
         # skip if this matches a constrained column
@@ -119,12 +119,12 @@ module ActiveScaffold::DataStructures
       def constraint_columns
         @constraint_columns ||= []
       end
-      
+
       attr_writer :unauthorized_columns
       def unauthorized_columns
         @unauthorized_columns ||= []
       end
-      
+
       def length
         ((@set - self.constraint_columns) - self.unauthorized_columns).length
       end

data/lib/active_scaffold/data_structures/action_link.rb

@@ -27,7 +27,7 @@ module ActiveScaffold::DataStructures
 
     # the action-path for this link. what page to request? this is required!
     attr_accessor :action
-    
+
     # the controller for this action link. if nil, the current controller should be assumed.
     attr_accessor :controller
 
@@ -42,7 +42,7 @@ module ActiveScaffold::DataStructures
     def label
       @label.is_a?(Symbol) ? as_(@label) : @label
     end
-    
+
     # image to use {:name => 'arrow.png', :size => '16x16'}
     attr_accessor :image
 
@@ -54,7 +54,7 @@ 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
@@ -74,9 +74,9 @@ module ActiveScaffold::DataStructures
     def security_method_set?
       !!@security_method
     end
-    
+
     attr_accessor :ignore_method
-    
+
     # the crud type of the (eventual?) action. different than :method, because this crud action may not be imminent.
     # this is used to determine record-level authorization (e.g. record.authorized_for?(:crud_type => link.crud_type).
     # options are :create, :read, :update, and :delete
@@ -145,18 +145,18 @@ module ActiveScaffold::DataStructures
 
     # html options for the link
     attr_accessor :html_options
-    
+
     # 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/action_links.rb

@@ -8,11 +8,15 @@ module ActiveScaffold::DataStructures
 
     # adds an ActionLink, creating one from the arguments if need be
     def add(action, options = {})
-      link = action.is_a?(ActiveScaffold::DataStructures::ActionLink) ? action : ActiveScaffold::DataStructures::ActionLink.new(action, options)
+      link = if action.is_a?(ActiveScaffold::DataStructures::ActionLink) || action.is_a?(ActiveScaffold::DataStructures::ActionLinks)
+        action
+      else
+        ActiveScaffold::DataStructures::ActionLink.new(action, options)
+      end
       # NOTE: this duplicate check should be done by defining the comparison operator for an Action data structure
-      existing = @set.find {|a| a.action == link.action and a.controller == link.controller and a.parameters == link.parameters}
+      existing = find_duplicate(link)
       unless existing
-        @set << link
+        subgroup(link.type, link.type).add_to_set(link)
         link
       else
         existing
@@ -20,40 +24,121 @@ module ActiveScaffold::DataStructures
     end
     alias_method :<<, :add
 
+    def add_to_set(link)
+      @set << link
+    end
+
     # finds an ActionLink by matching the action
     def [](val)
-      @set.find {|item| item.action == val.to_s}
+      @set.find do |item|
+        if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
+          item[val]
+        else
+          item.action == val.to_s
+        end
+      end
+    end
+
+    def find_duplicate(link)
+      @set.find do |item|
+        if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
+          item.find_duplicate(link)
+        else
+          item.action == link.action and item.controller == link.controller and item.parameters == link.parameters
+        end
+      end
     end
 
     def delete(val)
-      @set.delete_if{|item| item.action == val.to_s}
+      @set.delete_if do |item|
+        if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
+          delete(val)
+        else
+          item.action == val.to_s
+        end
+      end
     end
 
     # iterates over the links, possibly by type
     def each(type = nil)
-      type = type.to_sym if type
       @set.each {|item|
-        next if type and item.type != type
         yield item
       }
     end
-    
+
     def collect_by_type(type = nil)
       links = []
-      each(type) {|link| links << link}
+      subgroup(type).each(type) {|link| links << link}
       links
     end
 
+    def traverse(controller, options = {}, &block)
+      @set.each do |link|
+        if link.is_a?(ActiveScaffold::DataStructures::ActionLinks)
+          # add top node only if there is anything in the list
+          #yield({:kind => :node, :level => 1, :last => false, :link => link})
+          yield(link, nil, {:node => :start_traversing})
+          link.traverse(options, &block)
+          yield(link, nil, {:node => :finished_traversing})
+          #yield({:kind => :completed_group, :level => 1, :last => false, :link => link})
+        elsif controller.nil? || !skip_action_link(controller, link, options[:record])
+          authorized = options[:for].nil? ? true : options[:for].authorized_for?(:crud_type => link.crud_type, :action => link.action)
+          yield(self, link, {:authorized => authorized})
+        end
+      end
+    end
+
+    def collect
+      @set.collect
+    end
+
     def empty?
       @set.size == 0
     end
 
+    def subgroup(name, label = nil)
+      group = self if name == self.name
+      group ||= @set.find do |item|
+        name == item.name if item.is_a?(ActiveScaffold::DataStructures::ActionLinks)
+      end
+
+      if group.nil?
+        group = ActiveScaffold::DataStructures::ActionLinks.new
+        group.label = label || name
+        group.name = name
+        add_to_set group
+      end
+      group
+    end
+
+    attr_writer :label
+    def label
+      as_(@label) if @label
+    end
+
+    def method_missing(name, *args, &block)
+      class_eval %{
+        def #{name}
+          @#{name} ||= subgroup('#{name}'.to_sym)
+          yield @#{name} if block_given?
+          @#{name}
+        end
+      }
+      send(name, &block)
+    end
+
+    attr_accessor :name
+
     protected
 
+    def skip_action_link(controller, link, *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.
     def initialize_copy(from)
       @set = []
       from.instance_variable_get('@set').each { |link| @set << link.clone }
     end
   end
-end
+end

data/lib/active_scaffold/data_structures/column.rb

@@ -19,7 +19,7 @@ module ActiveScaffold::DataStructures
 
     # Whether to enable add_existing for this column
     attr_accessor :allow_add_existing
-    
+
     # Any extra parameters this particular column uses.  This is for create/update purposes.
     def params
       # lazy initialize
@@ -52,9 +52,9 @@ module ActiveScaffold::DataStructures
     def required?
       @required
     end
-    
+
     attr_reader :update_columns
-    
+
     # update dependent columns after value change in form
     #  update_columns = :name
     #  update_columns = [:name, :age]
@@ -199,7 +199,7 @@ module ActiveScaffold::DataStructures
     cattr_accessor :actions_for_association_links
     @@actions_for_association_links = [:new, :edit, :show]
     attr_accessor :actions_for_association_links
-    
+
     cattr_accessor :association_form_ui
     @@association_form_ui = nil
 
@@ -269,13 +269,13 @@ module ActiveScaffold::DataStructures
       @form_ui = :checkbox if @column and @column.type == :boolean
       @allow_add_existing = true
       @form_ui = self.class.association_form_ui if @association && self.class.association_form_ui
-      
+
       # default all the configurable variables
       self.css_class = ''
       self.required = active_record_class.validators_on(self.name).map(&:class).include? ActiveModel::Validations::PresenceValidator
       self.sort = true
       self.search_sql = true
-      
+
       @weight = estimate_weight
 
       self.includes = (association and not polymorphic_association?) ? [association.name] : []
@@ -308,7 +308,7 @@ module ActiveScaffold::DataStructures
         end
       end
     end
-    
+
     def initialize_search_sql
       self.search_sql = unless self.virtual?
         if association.nil?
@@ -328,13 +328,13 @@ module ActiveScaffold::DataStructures
     def field
       @field ||= [@active_record_class.connection.quote_column_name(@table), field_name].join('.')
     end
-    
+
     def estimate_weight
       if singular_association?
         400
       elsif plural_association?
         500
-      elsif [:created_at, :updated_at].include?(self.name) 
+      elsif [:created_at, :updated_at].include?(self.name)
         600
       elsif [:name, :label, :title].include?(self.name)
         100

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -1,7 +1,7 @@
 module ActiveScaffold::DataStructures
   class NestedInfo
     def self.get(model, session_storage)
-      if session_storage[:nested].nil? 
+      if session_storage[:nested].nil?
         nil
       else
         session_info = session_storage[:nested].clone
@@ -13,32 +13,32 @@ module ActiveScaffold::DataStructures
         end
       end
     end
-    
+
     attr_accessor :association, :child_association, :parent_model, :parent_id, :constrained_fields, :scope
-        
+
     def initialize(model, session_info)
       @parent_model = session_info[:parent_model]
       @parent_id = session_info[:parent_id]
     end
-    
+
     def new_instance?
       result = @new_instance.nil?
       @new_instance = false
       result
     end
-    
+
     def parent_scope
       parent_model.find(parent_id)
     end
-    
+
     def habtm?
-      false 
+      false
     end
-    
+
     def belongs_to?
       false
     end
-    
+
     def readonly?
       false
     end
@@ -47,22 +47,22 @@ module ActiveScaffold::DataStructures
       false
     end
   end
-  
+
   class NestedInfoAssociation < NestedInfo
     def initialize(model, session_info)
       super(model, session_info)
       @association = session_info[:association]
       iterate_model_associations(model)
     end
-    
+
     def habtm?
-      association.macro == :has_and_belongs_to_many 
+      association.macro == :has_and_belongs_to_many
     end
-    
+
     def belongs_to?
       association.belongs_to?
     end
-    
+
     def readonly?
       if association.options.has_key? :readonly
         association.options[:readonly]
@@ -78,11 +78,11 @@ module ActiveScaffold::DataStructures
     def default_sorting
       association.options[:order]
     end
-    
+
     protected
-    
+
     def iterate_model_associations(model)
-      @constrained_fields = [] 
+      @constrained_fields = []
       @constrained_fields << association.primary_key_name.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
@@ -91,18 +91,18 @@ module ActiveScaffold::DataStructures
         end
         if association.primary_key_name == current.primary_key_name
           # show columns for has_many and has_one child associationes
-          constrained_fields << current.name.to_sym if current.belongs_to? 
+          constrained_fields << current.name.to_sym if current.belongs_to?
           @child_association = current
         end
       end
     end
   end
-  
+
   class NestedInfoScope < NestedInfo
     def initialize(model, session_info)
       super(model, session_info)
       @scope = session_info[:name]
-      @constrained_fields = [] 
+      @constrained_fields = []
     end
   end
 end

data/lib/active_scaffold/data_structures/set.rb

@@ -53,10 +53,11 @@ module ActiveScaffold::DataStructures
     def length
       @set.length
     end
-    
+
     def empty?
       @set.empty?
     end
 
   end
-end
+
+end

data/lib/active_scaffold/data_structures/sorting.rb

@@ -7,7 +7,7 @@ module ActiveScaffold::DataStructures
       @columns = columns
       @clauses = []
     end
-    
+
     def set_default_sorting(model)
       model_scope = model.send(:current_scoped_methods)
       order_clause = model_scope.arel.order_clauses.join(",") if model_scope
@@ -26,7 +26,7 @@ module ActiveScaffold::DataStructures
       clear
       set_sorting_from_order_clause(order_clause, table_name)
     end
-    
+
     # add a clause to the sorting, assuming the column is sortable
     def add(column_name, direction = nil)
       direction ||= 'ASC'
@@ -121,7 +121,7 @@ module ActiveScaffold::DataStructures
     def mixed_sorting?
       sorts_by_method? and sorts_by_sql?
     end
-    
+
     def default_sorting?
       @default_sorting
     end
@@ -135,7 +135,7 @@ module ActiveScaffold::DataStructures
         end
       end
     end
-    
+
     def extract_order_parts(criterion_parts)
       column_name_part, direction_part = criterion_parts.strip.split(' ')
       column_name_parts = column_name_part.split('.')
@@ -144,11 +144,11 @@ module ActiveScaffold::DataStructures
       order[:table_name] = remove_quotes(column_name_parts[-2]) if column_name_parts.length >= 2
       order
     end
-    
+
     def different_table?(model_table_name, order_table_name)
       !order_table_name.nil? && model_table_name != order_table_name
     end
-    
+
     def remove_quotes(sql_name)
       if sql_name.starts_with?('"') || sql_name.starts_with?('`')
         sql_name[1, (sql_name.length - 2)]
@@ -156,7 +156,7 @@ module ActiveScaffold::DataStructures
         sql_name
       end
     end
-    
+
     def extract_direction(direction_part)
       if direction_part.to_s.upcase == 'DESC'
         'DESC'

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -330,7 +330,7 @@ module ActiveScaffold
 
       def column_heading_value(column, sorting, sort_direction)
         if column.sortable?
-          options = {:id => search_form_id, :class => "as_sort",
+          options = {:id => nil, :class => "as_sort",
                      'data-page-history' => controller_id,
                      :remote => true, :method => :get}
           url_options = params_for(:action => :index, :page => 1,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 15
   prerelease: false
   segments: 
   - 3
   - 0
-  - 2
-  version: 3.0.2
+  - 4
+  version: 3.0.4
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 -05:00
+date: 2010-11-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency