active_scaffold 3.3.0.rc2 → 3.3.0.rc3

data/CHANGELOG

@@ -25,6 +25,7 @@
 - Cosmetic fixes and improvements
 - Fix multipart persistent update form
 - Support jquery 1.9 (jquery-rails 2.2.0 gem)
+- Reduce usage of session
 
 = 3.2.19 (not released yet)
 - Avoid crashing when between is chosen and from or to is not filled

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -200,6 +200,11 @@ jQuery(document).ready(function($) {
     ActiveScaffold[jQuery(this).val() == 'REPLACE' ? 'hide' : 'show'](jQuery(this).next().next());
     return true;
   });
+  
+  jQuery(document).on('click', '.active-scaffold .sub-form a.destroy', function(event) {
+  	event.preventDefault();
+  	ActiveScaffold.delete_subform_record($(this).data('delete-id'));
+  });
 
   jQuery(document).on('click', 'a[data-popup]', function(e) {
     window.open(jQuery(this).attr('href'));
@@ -692,7 +697,7 @@ var ActiveScaffold = {
   render_form_field: function(source, content, options) {
     if (typeof(source) == 'string') source = '#' + source;
     var source = jQuery(source);
-    var element = source.closest('.association-record').nextUntil('.association-record').addBack();
+    var element = source.closest('.sub-form-record');
     if (element.length == 0) {
       element = source.closest('form > ol.form');
     }

data/app/assets/javascripts/jquery/date_picker_bridge.js.erb

@@ -1,3 +1,4 @@
+<%# encoding: utf-8 %>
 <%= ActiveScaffold::Bridges[:date_picker].localization %>
 jQuery(document).on("focus", "input.date_picker", function(){
   var date_picker = jQuery(this);
@@ -19,4 +20,4 @@ jQuery(document).on("focus", "input.datetime_picker", function(){
     }
   }
   return true;
-});
+});

data/app/views/active_scaffold_overrides/_form_association_record.html.erb

@@ -62,9 +62,7 @@
 <% if show_actions -%>
   <%= content_tag column_tag, :class => "actions" do %>
     <% if record_column.plural_association? and (@record.authorized_for?(:crud_type => :delete) or not [:destroy, :delete_all].include?(record_column.association.options[:dependent])) %>
-      <% destroy_id = "#{options[:id]}-destroy" %>
-      <%= link_to as_(:remove), '#', :class => 'destroy', :id => destroy_id , :onclick => "ActiveScaffold.delete_subform_record(\"#{tr_id}\"); return false;", :style=> "display: none;" %>
-      <%= javascript_tag("ActiveScaffold.show('#{destroy_id}');") if !locked %>
+      <%= link_to as_(:remove), '#', :class => 'destroy', :id => "#{options[:id]}-destroy" , :data => {:delete_id => tr_id} unless locked %>
     <% end %>
     <% unless @record.new_record? %>
       <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= @record.id -%>" />

data/app/views/active_scaffold_overrides/_list_inline_adapter.html.erb

@@ -12,10 +12,12 @@
 <%# nested_id, allows us to remove a nested scaffold programmatically %>
 <tr class="inline-adapter" id="<%= element_row_id :action => :nested %>">
   <td colspan="<%= column_count %>" class="inline-adapter-cell">
+<% if controller.send(:successful?) %>
     <div class="<%= "#{params[:action]}-view" if params[:action] %> <%= "#{nested? ? nested.name : id_from_controller(params[:controller])}-view" %> view">
       <%= link_to(as_(:close), '', :class => 'inline-adapter-close as_cancel', :remote => true, :title => as_(:close)) -%>
       <%= payload -%>
     </div>
+<% end %>
   </td>
 </tr>
-<%= javascript_tag("var action_link = ActiveScaffold.ActionLink.get('#{element_row_id(:action => :nested)}'); if (action_link) action_link.update_flash_messages('#{escape_javascript(render(:partial => 'messages').strip)}');") %>
+<%= javascript_tag("setTimeout(function() { var action_link = ActiveScaffold.ActionLink.get('#{element_row_id(:action => :nested)}'); if (action_link) { action_link.update_flash_messages('#{escape_javascript(render(:partial => 'messages').strip)}');#{' action_link.close(); ActiveScaffold.scroll_to(action_link.scaffold(), ActiveScaffold.config.scroll_on_close == "checkInViewport");' unless controller.send(:successful?)} } }, 10);") %>

data/app/views/active_scaffold_overrides/_list_with_header.html.erb

@@ -17,7 +17,7 @@
       <% else %>
       <tr><td></td></tr>
       <% end %>
-      <% if !nested? && active_scaffold_config.list.always_show_create %>
+      <% if active_scaffold_config.list.always_show_create %>
       <% old_record, @record = @record, new_model %>
         <tr> 
           <td> 

data/app/views/active_scaffold_overrides/on_action_update.js.erb

@@ -16,7 +16,7 @@
     <%= render :partial => 'refresh_list' %>
   <% end %>
 <% else %>
-  <% flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br) if @record.errors.present? %>
+  <% flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br) if @record.try(:errors).present? %>
   ActiveScaffold.replace_html('<%= active_scaffold_messages_id %>','<%= escape_javascript(render(:partial => 'messages')) %>');
   ActiveScaffold.scroll_to('<%= active_scaffold_messages_id %>', true);
 <% end %>

data/app/views/active_scaffold_overrides/on_create.js.erb

@@ -1,9 +1,13 @@
 try {
 <% form_selector = "#{element_form_id(:action => :create)}"
-insert_at ||= :top %>
-var action_link = ActiveScaffold.find_action_link('<%= form_selector%>');
-action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages'))%>');
-<% if controller.send :successful? %>
+insert_at ||= :top -%>
+<% if active_scaffold_config.list.always_show_create -%>
+<%= render :partial => 'update_messages' %>
+<% else -%>
+var action_link = ActiveScaffold.find_action_link('<%= form_selector %>');
+action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'messages')) %>');
+<% end -%>
+<% if controller.send :successful? -%>
   <% if render_parent? %>
     <% if nested_singular_association? %>
       action_link.close(true);
@@ -12,16 +16,18 @@ action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'mess
     <% else %>
       ActiveScaffold.reload('<%= url_for render_parent_options %>');
     <% end %>
-  <% elsif (active_scaffold_config.create.refresh_list) %>
+  <% elsif active_scaffold_config.create.refresh_list %>
     <%= render :partial => 'refresh_list' %>
   <% elsif params[:parent_controller].nil? %>
     <% new_row = render :partial => 'list_record', :locals => {:record => @record} %>
-    ActiveScaffold.create_record_row(action_link.scaffold(),'<%= escape_javascript(new_row) %>', <%= {:insert_at => insert_at}.to_json.html_safe %>);
+    ActiveScaffold.create_record_row(action_link ? action_link.scaffold() : '<%= active_scaffold_id %>', '<%= escape_javascript(new_row) %>', <%= {:insert_at => insert_at}.to_json.html_safe %>);
     <%= render :partial => 'update_calculations', :formats => [:js] %>
   <% end %>
 
   <% unless render_parent? %>
-    <% if (active_scaffold_config.create.persistent) %>
+    <% if active_scaffold_config.list.always_show_create %>
+      ActiveScaffold.reset_form('<%= form_selector %>');
+    <% elsif active_scaffold_config.create.persistent %>
       action_link.reload();
     <% else %>
       action_link.close();

data/lib/active_scaffold.rb

@@ -85,21 +85,29 @@ module ActiveScaffold
     self.class.active_scaffold_config_for(klass)
   end
 
-  def active_scaffold_session_storage(id = nil)
+  def active_scaffold_session_storage_key(id = nil)
     id ||= params[:eid] || "#{params[:controller]}#{"_#{nested.parent_id}" if nested?}"
-    session_index = "as:#{id}"
+    "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
-        active_scaffold_session_storage[action_name] ||= {}
-        conf_instance.user = conf_instance.class::UserSettings.new(conf_instance, active_scaffold_session_storage[action_name], params)
+        conf_instance.user = conf_instance.class::UserSettings.new(conf_instance, active_scaffold_session_storage, params)
       end
     end
   end

data/lib/active_scaffold/actions/core.rb

@@ -4,6 +4,7 @@ module ActiveScaffold::Actions
       base.class_eval do
         prepend_before_filter :register_constraints_with_action_columns, :unless => :nested?
         after_filter :clear_flashes
+        after_filter :clear_storage
         rescue_from ActiveScaffold::RecordNotAllowed, ActiveScaffold::ActionNotAllowed, :with => :deny_access
       end
       base.helper_method :nested?
@@ -118,7 +119,7 @@ module ActiveScaffold::Actions
     # circumvent this method by setting @success directly.
     def successful?
       if @successful.nil?
-        @record || @records
+        true
       else
         @successful
       end

data/lib/active_scaffold/actions/create.rb

@@ -47,7 +47,7 @@ module ActiveScaffold::Actions
             return_to_main
           end
         else
-          if !nested? && active_scaffold_config.actions.include?(:list) && active_scaffold_config.list.always_show_create
+          if active_scaffold_config.actions.include?(:list) && active_scaffold_config.list.always_show_create
             list
           else
             render(:action => 'create')
@@ -118,7 +118,7 @@ module ActiveScaffold::Actions
     # You may override the method to customize.
     
     def create_ignore?
-      nested? && active_scaffold_config.list.always_show_create
+      active_scaffold_config.list.always_show_create
     end
     
     def create_authorized?

data/lib/active_scaffold/actions/list.rb

@@ -85,6 +85,9 @@ module ActiveScaffold::Actions
             :pagination => active_scaffold_config.list.pagination
           })
       end
+      if active_scaffold_config.list.auto_select_columns
+        options[:select] = active_scaffold_config.list.columns.map(&:select_columns).compact.flatten + active_scaffold_config.columns[active_scaffold_config.model.primary_key].select_columns
+      end
 
       page = find_page(options)
       total_pages = page.pager.number_of_pages

data/lib/active_scaffold/actions/nested.rb

@@ -32,7 +32,7 @@ module ActiveScaffold::Actions
     
     def configure_nested
       if nested?
-        active_scaffold_session_storage[:list][:label] =  if nested.belongs_to?
+        active_scaffold_config.list.user.label = if nested.belongs_to?
           as_(:nested_of_model, :nested_model => active_scaffold_config.model.model_name.human, :parent_model => nested_parent_record.to_label)
         else
           as_(:nested_for_model, :nested_model => active_scaffold_config.list.label, :parent_model => nested_parent_record.to_label)

data/lib/active_scaffold/actions/show.rb

@@ -9,7 +9,6 @@ module ActiveScaffold::Actions
       # just render action_confirmation message for destroy
       unless params.delete :destroy_action
         do_show
-        successful?
         respond_to_action(:show)
       else
         @record = find_if_allowed(params[:id], :read) if params[:id] && params[:id] && params[:id].to_i > 0

data/lib/active_scaffold/attribute_params.rb

@@ -74,7 +74,8 @@ module ActiveScaffold
           association_proxy.each { |record| record.send("#{a.reverse}=", parent_record) }
         end
       end
-
+    
+      flash[:warning] = parent_record.errors.to_a.join("\n") if parent_record.errors.present?
       parent_record
     end
     
@@ -110,7 +111,11 @@ module ActiveScaffold
     end
     
     def column_value_for_datetime_type(parent_record, column, value)
-      self.class.condition_value_for_datetime(column, value, self.class.datetime_conversion_for_condition(column))
+      new_value = self.class.condition_value_for_datetime(column, value, self.class.datetime_conversion_for_condition(column))
+      if new_value.nil? && value.present?
+        parent_record.errors.add column.name, :invalid
+      end
+      new_value
     end
 
     def column_value_from_param_simple_value(parent_record, column, value)

data/lib/active_scaffold/config/base.rb

@@ -42,13 +42,23 @@ module ActiveScaffold::Config
     attr_accessor :action_group
 
     class UserSettings
-      def initialize(conf, storage, params)
+      def initialize(conf, storage, params, action = :base)
         # the session hash relevant to this action
         @session = storage
         # all the request params
         @params = params
         # the configuration object for this action
         @conf = conf
+        @action = action
+      end
+
+      def [](key)
+        @session[@action][key] if @action && @session[@action]
+      end
+
+      def []=(key, value)
+        @session[@action] ||= {}
+        @session[@action][key] = value
       end
     end
     

data/lib/active_scaffold/config/list.rb

@@ -24,6 +24,7 @@ module ActiveScaffold::Config
       @always_show_search = self.class.always_show_search
       @always_show_create = self.class.always_show_create
       @messages_above_header = self.class.messages_above_header
+      @auto_select_columns = self.class.auto_select_columns
     end
 
     # global level configuration
@@ -80,6 +81,10 @@ module ActiveScaffold::Config
     cattr_accessor :always_show_create
     @@always_show_create = false
 
+    # Enable auto select columns on list, so only columns needed for list columns are selected
+    cattr_accessor :auto_select_columns
+    @@auto_select_columns = false
+
     # instance-level configuration
     # ----------------------------
 
@@ -182,29 +187,33 @@ module ActiveScaffold::Config
     # it allows for more css styling
     attr_accessor :wrap_tag
     
+    # Enable auto select columns on list, so only columns needed for list columns are selected
+    attr_accessor :auto_select_columns
+
     class UserSettings < UserSettings
       def initialize(conf, storage, params)
-        super(conf,storage,params)
+        super(conf, storage, params, :list)
         @sorting = nil
       end
       
+      attr_writer :label
       # This label has alread been localized.
       def label
-        @session[:label] ? @session[:label] : @conf.label
+        @label || @conf.label
       end
 
       def per_page
-        @session['per_page'] = @params['limit'].to_i if @params.has_key? 'limit'
-        @session['per_page'] || @conf.per_page
+        self['per_page'] = @params['limit'].to_i if @params.has_key? 'limit'
+        self['per_page'] || @conf.per_page
       end
 
       def page
-        @session['page'] = @params['page'] if @params.has_key? 'page'
-        @session['page'] || 1
+        self['page'] = @params['page'] if @params.has_key? 'page'
+        self['page'] || 1
       end
 
       def page=(value = nil)
-        @session['page'] = value
+        self['page'] = value
       end
 
       attr_reader :nested_default_sorting
@@ -221,12 +230,12 @@ module ActiveScaffold::Config
       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'
+          self['sort'] = [@params['sort'], @params['sort_direction']] if @params['sort'] and @params['sort_direction']
+          self['sort'] = nil if @params['sort_direction'] == 'reset'
 
-          if @session['sort']
+          if self['sort']
             sorting = @conf.sorting.clone
-            sorting.set(*@session['sort'])
+            sorting.set(*self['sort'])
             @sorting = sorting
           else
             @sorting = default_sorting

data/lib/active_scaffold/data_structures/column.rb

@@ -22,6 +22,9 @@ module ActiveScaffold::DataStructures
     # Whether to enable add_existing for this column
     attr_accessor :allow_add_existing
     
+    # What columns load from main table
+    attr_accessor :select_columns
+    
     # Any extra parameters this particular column uses.  This is for create/update purposes.
     def params
       # lazy initialize
@@ -172,7 +175,7 @@ module ActiveScaffold::DataStructures
     end
 
     # a collection of columns to load when eager loading is disabled, if it's nil all columns will be loaded
-    attr_accessor :select_columns
+    attr_accessor :select_associated_columns
 
     # describes how to search on a column
     #   search = true           default, uses intelligent search sql
@@ -293,6 +296,24 @@ module ActiveScaffold::DataStructures
       @show_blank_record = self.class.show_blank_record
       @send_form_on_update_column = self.class.send_form_on_update_column
       @actions_for_association_links = self.class.actions_for_association_links.clone if @association
+      @select_columns = if @association.nil? && @column
+        [field]
+      elsif polymorphic_association?
+        [field, quoted_field(@active_record_class.connection.quote_column_name(@association.foreign_type))]
+      elsif @association
+        if self.association.macro == :belongs_to
+          [field]
+        else
+          columns = []
+          if active_record_class.columns_hash[count_column = "#{@association.name}_count"]
+            columns << quoted_field(@active_record_class.connection.quote_column_name(count_column))
+          end
+          if @association.through_reflection.try(:macro) == :belongs_to
+            columns << quoted_field(@active_record_class.connection.quote_column_name(@association.through_reflection.foreign_key))
+          end
+          columns
+        end
+      end
       
       self.number = @column.try(:number?)
       @options = {:format => :i18n_number} if self.number?
@@ -305,8 +326,8 @@ module ActiveScaffold::DataStructures
       # default all the configurable variables
       self.css_class = ''
       self.required = active_record_class.validators_on(self.name).any? do |val|
-        ActiveModel::Validations::PresenceValidator === val or (
-          ActiveModel::Validations::InclusionValidator === val and not val.options[:allow_nil] and not val.options[:allow_blank]
+        !val.options[:if] && !val.options[:unless] && (ActiveModel::Validations::PresenceValidator === val ||
+          (ActiveModel::Validations::InclusionValidator === val && !val.options[:allow_nil] && !val.options[:allow_blank])
         )
       end
       self.sort = true
@@ -356,11 +377,15 @@ module ActiveScaffold::DataStructures
 
     # the table.field name for this column, if applicable
     def field
-      @field ||= [@active_record_class.quoted_table_name, field_name].join('.')
+      @field ||= quoted_field(field_name)
     end
 
     protected
 
+    def quoted_field(name)
+      [@active_record_class.quoted_table_name, name].join('.')
+    end
+
     def initialize_sort
       if self.virtual?
         # we don't automatically enable method sorting for virtual columns because it's slow, and we expect fewer complaints this way.

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -43,7 +43,11 @@ module ActionView::Helpers #:nodoc:
         constraints = options[:constraints]
         conditions = options[:conditions]
         eid = Digest::MD5.hexdigest(params[:controller] + remote_controller.to_s + constraints.to_s + conditions.to_s)
-        session["as:#{eid}"] = {:constraints => constraints, :conditions => conditions, :list => {:label => args.first[:label]}}
+        eid_info = {}
+        eid_info[:constraints] = constraints if constraints
+        eid_info[:conditions] = conditions if conditions
+        eid_info[:list] = {:label => args.first[:label]} if args.first[:label]
+        session["as:#{eid}"] = eid_info
         options[:params] ||= {}
         options[:params].merge! :eid => eid, :embedded => true
 

data/lib/active_scaffold/finder.rb

@@ -324,7 +324,8 @@ module ActiveScaffold
       finder_options = { :reorder => options[:sorting].try(:clause),
                          :conditions => search_conditions,
                          :joins => joins_for_finder,
-                         :includes => full_includes}
+                         :includes => full_includes,
+                         :select => options[:select]}
     
       finder_options.merge! custom_finder_options
       finder_options
@@ -348,7 +349,7 @@ module ActiveScaffold
     # returns a Paginator::Page (not from ActiveRecord::Paginator) for the given parameters
     # See finder_options for valid options
     def find_page(options = {})
-      options.assert_valid_keys :sorting, :per_page, :page, :count_includes, :pagination
+      options.assert_valid_keys :sorting, :per_page, :page, :count_includes, :pagination, :select
       options[:per_page] ||= 999999999
       options[:page] ||= 1
 
@@ -392,8 +393,8 @@ module ActiveScaffold
     
     def append_to_query(query, options)
       options.assert_valid_keys :where, :select, :group, :reorder, :limit, :offset, :joins, :includes, :lock, :readonly, :from, :conditions
-      query = apply_conditions(query, *options.delete(:conditions)) if options[:conditions]
-      options.reject{|k, v| v.blank?}.inject(query) do |query, (k, v)|
+      query = apply_conditions(query, *options[:conditions]) if options[:conditions]
+      options.reject{|k, v| k == :conditions || v.blank?}.inject(query) do |query, (k, v)|
         query.send((k.to_sym), v) 
       end
     end

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -187,7 +187,7 @@ module ActiveScaffold
           if column.associated_limit.nil?
             Rails.logger.warn "ActiveScaffold: Enable eager loading for #{column.name} association to reduce SQL queries"
           elsif column.associated_limit > 0
-            value.target = value.find(:all, :limit => column.associated_limit + 1, :select => column.select_columns)
+            value.target = value.find(:all, :limit => column.associated_limit + 1, :select => column.select_associated_columns)
           elsif @cache_associations
             value.target = size.to_i.zero? ? [] : [nil]
           end

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -169,7 +169,7 @@ module ActiveScaffold
           options.delete :link if link.crud_type == :create
         end
         if link.action.nil? || (link.type == :member && options.has_key?(:authorized) && !options[:authorized])
-          action_link_html(link, nil, options.merge(:class => "disabled #{link.action}#{" #{link.html_options[:class]}" unless link.html_options[:class].blank?}"), record)
+          action_link_html(link, nil, {:link => options[:link], :class => "disabled #{link.action}#{" #{link.html_options[:class]}" unless link.html_options[:class].blank?}"}, record)
         else
           url = action_link_url(link, record)
           html_options = action_link_html_options(link, record, options)
@@ -321,9 +321,10 @@ module ActiveScaffold
         url_options
       end
       
-      def action_link_html_options(link, record, html_options)
+      def action_link_html_options(link, record, options)
         link_id = get_action_link_id(link, record)
-        html_options.reverse_merge! link.html_options.merge(:class => link.action.to_s)
+        html_options = link.html_options.merge(:class => [link.html_options[:class], link.action.to_s].compact.join(' '))
+        html_options[:link] = options[:link] if options[:link]
 
         # Needs to be in html_options to as the adding _method to the url is no longer supported by Rails        
         html_options[:method] = link.method if link.method != :get
@@ -331,7 +332,7 @@ module ActiveScaffold
         html_options[:data] = {}
         html_options[:data][:confirm] = link.confirm(record.try(:to_label)) if link.confirm?
         if link.inline?
-          html_options[:class] += ' as_action'
+          html_options[:class] << ' as_action'
           html_options[:data][:position] = link.position if link.position
           html_options[:data][:action] = link.action
           html_options[:data][:cancel_refresh] = true if link.refresh_on_close
@@ -345,13 +346,12 @@ module ActiveScaffold
         html_options[:remote] = true unless link.page? || link.popup?
         if link.dhtml_confirm?
           unless link.inline?
-            html_options[:class] += ' as_action'
+            html_options[:class] << ' as_action'
             html_options[:page_link] = 'true'
           end
           html_options[:dhtml_confirm] = link.dhtml_confirm.value
           html_options[:onclick] = link.dhtml_confirm.onclick_function(controller, link_id)
         end
-        html_options[:class] += " #{link.html_options[:class]}" unless link.html_options[:class].blank?
         html_options
       end
 
@@ -512,8 +512,9 @@ module ActiveScaffold
       def override_helper(column, suffix)
         @_override_helpers ||= {}
         @_override_helpers[suffix] ||= {}
-        return @_override_helpers[suffix][column.name] if @_override_helpers[suffix].include? column.name
-        @_override_helpers[suffix][column.name] = begin
+        @_override_helpers[suffix][@record.class.name] ||= {}
+        return @_override_helpers[suffix][@record.class.name][column.name] if @_override_helpers[suffix][@record.class.name].include? column.name
+        @_override_helpers[suffix][@record.class.name][column.name] = begin
           method_with_class = override_helper_name(column, suffix, true)
           if respond_to?(method_with_class)
             method_with_class

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 3
-    PATCH = "0.rc2"
+    PATCH = "0.rc3"
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: -1415994350
+  hash: 2488911141
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - rc
-  - 2
-  version: 3.3.0.rc2
+  - 3
+  version: 3.3.0.rc3
 platform: ruby
 authors: 
 - Many, see README
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-12 00:00:00 Z
+date: 2013-03-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -443,7 +443,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rails 3.1 Version of activescaffold supporting prototype and jquery