active_scaffold 3.2.0 → 3.2.1

data/README

@@ -1,7 +1,3 @@
-******************************************************************************************************
-** For all documentation see the project website: http://github.com/vhochstein/active_scaffold/wiki **
-******************************************************************************************************
-
 ActiveScaffold Gem/Plugin by Scott Rutherford (scott@caronsoftware.com), Richard White (rrwhite@gmail.com), Lance Ivy (lance@cainlevy.net), Ed Moss, Tim Harper and Sergio Cambra (sergio@entrecables.com)
 
 Uses DhtmlHistory by Brad Neuberg (bkn3@columbia.edu)
@@ -18,9 +14,16 @@ http://code.google.com/p/recordselect/
 
 == Version Information
 
-Please note the following list of Active Scaffold branches and Rails versions. Master will not work with Rails < 3.1
+If you want to use the gem, add to your Gemfile:
+  gem "active_scaffold"
 
-Active Scaffold master currently supports rails-3.1, but incompatible changes can be introduced, if you want an stable version, use rails-3.0
+In case you would like to use most recent commit:
+  gem 'active_scaffold', :git => 'git://github.com/activescaffold/active_scaffold.git'
+
+3.1.* and 3.2.* versions works with rails 3.1 and 3.2, 3.0.* versions with rails 3.0.
+To use previous rails versions you will have to install the right branch as a plugin.
+
+Active Scaffold master currently supports rails 3.1 and rails 3.2, you can use following branches for previous rails versions:
 Rails 3.0.*: Active Scaffold rails-3.0
 Rails 2.3.*: Active Scaffold rails-2.3 and v2.4
 Rails 2.2.*: Active Scaffold rails-2.2
@@ -31,19 +34,13 @@ Since Rails 2.3, render_component plugin is needed for nested and embedded scaff
 script/plugin install git://github.com/ewildgoose/render_component.git -r rails-2.3
 
 Since Rails 3.0 render_component is not used for nesting, but is optional for embedded scaffolds.
-Since Rails 3.0, https://github.com/rails/verification.git is also needed.
+For Rails 3.0, https://github.com/rails/verification.git is also needed, not in rails 3.1 or higher.
 
 If you want to install as plugins under vendor/plugins, install these versions:
   rails plugin install git://github.com/vhochstein/render_component.git
   rails plugin install git://github.com/rails/verification.git
   rails plugin install git://github.com/activescaffold/active_scaffold.git -r 'rails-3.0'
 
-If you want to use the gem, add to your Gemfile:
-  gem "active_scaffold"
-
-In case you would like to use most recent commit:
-  gem 'active_scaffold', :git => 'git://github.com/activescaffold/active_scaffold.git', :branch => 'rails-3.0'
-
 == Pick your own javascript framework
 
 The Rails 3.0 version uses unobtrusive Javascript, so you are free to pick your javascript framework.
@@ -66,8 +63,4 @@ To configure the javascript framework when installed as a gem:
 Add a config/initializers/active_scaffold.rb containing:
 ActiveScaffold.js_framework = :jquery # :prototype is the default
 
-== Rails 3.1 compatible branch: 
-under construction
-
-
 Released under the MIT license (included)

data/app/assets/stylesheets/active_scaffold-ie.css.scss

@@ -0,0 +1,54 @@
+/* IE hacks
+   ==================================== */
+
+* html .active-scaffold-header,
+.active-scaffold li.form-element,
+.active-scaffold li.sub-section {
+zoom: 1;
+}
+
+* html .active-scaffold td .messages-container {
+border-top: solid 1px #DAFFCD;
+}
+
+* html .active-scaffold-header div.actions a.show_search {
+background-image: none;
+filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='#{image_path('active_scaffold/magnifier.png')}', sizingMethod='crop');
+}
+
+* html .active-scaffold .sub-form .association-record a.destroy {
+background-image: none;
+filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='#{image_path('active_scaffold/cross.png')}', sizingMethod='crop');
+}
+* html .active-scaffold-header div.actions a.new,
+* html .active-scaffold-header div.actions a.new_existing {
+background-image: none;
+filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='#{image_path('active_scaffold/add.png')}', sizingMethod='crop');
+}
+* html .active-scaffold-header th.asc a,
+* html .active-scaffold-header th.asc a:hover {
+background-image: none;
+filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='#{image_path('active_scaffold/arrow_up.png')}', sizingMethod='crop');
+}
+* html .active-scaffold-header th.desc a,
+* html .active-scaffold-header th.desc a:hover {
+background-image: none;
+filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='#{image_path('active_scaffold/arrow_down.png')}', sizingMethod='crop');
+}
+* html .active-scaffold-header a.inline-adapter-close {
+background-image: none;
+filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='#{image_path('active_scaffold/close.png')}', sizingMethod='crop');
+}
+
+.active-scaffold-header div.actions a.disabled {
+filter: alpha(opacity=50);
+}
+
+.active-scaffold .show-view dd,
+.active-scaffold li.form-element dd {
+float: none;
+}
+
+.active-scaffold li.form-element dt {
+padding: 4px 0;
+}

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

@@ -8,30 +8,27 @@
 
 .active-scaffold-header div.actions a.new,
 .active-scaffold-header div.actions a.new_existing {
-background-image: image-url('active_scaffold/add.gif');
+background-image: image-url('active_scaffold/add.png');
 }
 
 .active-scaffold-header div.actions a.show_search {
 background-image: image-url('active_scaffold/magnifier.png');
 }
 
-.active-scaffold th.asc a,
-.active-scaffold th.asc a:hover {
-background-image: image-url('active_scaffold/arrow_up.gif');
+.active-scaffold th.asc a {
+background-image: image-url('active_scaffold/arrow_up.png');
 }
 
-.active-scaffold th.desc a,
-.active-scaffold th.desc a:hover {
-background-image: image-url('active_scaffold/arrow_down.gif');
+.active-scaffold th.desc a {
+background-image: image-url('active_scaffold/arrow_down.png');
 }
 
-.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');
 }
 
 .active-scaffold a.inline-adapter-close {
-background-image: image-url('active_scaffold/close.gif');
+background-image: image-url('active_scaffold/close.png');
 }
 
 .active-scaffold .sub-form .association-record a.destroy {

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_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.foreign_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/_list_inline_adapter.html.erb

@@ -1,6 +1,13 @@
+<%
+  column_count = if nested?
+    active_scaffold_config_for(nested.parent_model).list.columns.count + 1
+  else
+    active_scaffold_config.list.columns.count + 1
+  end
+%>
 <%# nested_id, allows us to remove a nested scaffold programmatically %>
 <tr class="inline-adapter" id="<%= element_row_id :action => :nested %>">
-  <td colspan="99" class="inline-adapter-cell">
+  <td colspan="<%= column_count %>" class="inline-adapter-cell">
     <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), 'data-refresh' => (action_name == 'index' ? true : false)) -%>
       <%= payload -%>

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

@@ -1,8 +1,7 @@
 <%
 record = list_record if list_record # compat with render :partial :collection
 columns ||= list_columns
-tr_class = cycle("", "even-record")
-tr_class += " #{list_row_class(record)}" if respond_to? :list_row_class
+tr_class = cycle("", "even-record") + ' ' + list_row_class(record)
 url_options = params_for(:action => :list, :id => record.id)
 action_links ||= active_scaffold_config.action_links.member
 -%>

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

@@ -2,7 +2,6 @@ module ActiveScaffold::Actions
   module Core
     def self.included(base)
       base.class_eval do
-        before_filter :register_constraints_with_action_columns
         after_filter :clear_flashes
       end
       base.helper_method :nested?
@@ -37,15 +36,17 @@ module ActiveScaffold::Actions
         @scope = params[:scope]
         
         if column.send_form_on_update_column
-          hash = if @scope
-            @scope.gsub('[','').split(']').inject(params[:record]) do |hash, index|
+          if @scope
+            hash = @scope.gsub('[','').split(']').inject(params[:record]) do |hash, index|
               hash[index]
             end
+            id = hash[:id]
           else
-            params[:record]
+            hash = params[:record]
+            id = params[:id]
           end
-          @record = hash[:id] ? find_if_allowed(hash[:id], :update) : new_model
-          @record = update_record_from_params(@record, active_scaffold_config.send(@scope ? :subform : (params[:id] ? :update : :create)).columns, hash)
+          @record = id ? find_if_allowed(id, :update) : new_model
+          @record = update_record_from_params(@record, active_scaffold_config.send(@scope ? :subform : (id ? :update : :create)).columns, hash)
         else
           @record = new_model
           value = column_value_from_param_value(@record, column, params[:value])

data/lib/active_scaffold/actions/create.rb

@@ -34,7 +34,7 @@ module ActiveScaffold::Actions
     def create_respond_to_html
       if params[:iframe]=='true' # was this an iframe post ?
         responds_to_parent do
-          render :action => 'on_create.js', :layout => false
+          render :action => 'on_create', :format => [:js], :layout => false
         end
       else
         if successful?

data/lib/active_scaffold/actions/list.rb

@@ -36,7 +36,7 @@ module ActiveScaffold::Actions
         params.delete(:embedded)
         render(:partial => 'list_with_header')
       else
-        render :action => 'refresh_list.js'
+        render :action => 'refresh_list', :format => [:js]
       end
     end
     def list_respond_to_xml

data/lib/active_scaffold/actions/subform.rb

@@ -2,7 +2,7 @@ module ActiveScaffold::Actions
   module Subform
     def edit_associated
       do_edit_associated
-      render :action => 'edit_associated.js'
+      render :action => 'edit_associated', :format => [:js]
     end
 
     protected

data/lib/active_scaffold/actions/update.rb

@@ -35,7 +35,7 @@ module ActiveScaffold::Actions
     def update_respond_to_html
       if params[:iframe]=='true' # was this an iframe post ?
         responds_to_parent do
-          render :action => 'on_update.js', :layout => false
+          render :action => 'on_update', :format => [:js], :layout => false
         end
       else # just a regular post
         if successful?

data/lib/active_scaffold/bridges/bitfields/bitfields_bridge.rb

@@ -0,0 +1,37 @@
+module ActiveScaffold
+  module Bridges
+    class Bitfields
+      module BitfieldsBridge
+        def initialize_with_bitfields(model_id)
+          initialize_without_bitfields(model_id)
+          return unless self.model.respond_to?(:bitfields) and self.model.bitfields.present?
+
+          self.model.bitfields.each do |column_name, options|
+            self.columns << options.keys
+            options.each do |column, value|
+              self.columns[column].form_ui = :checkbox
+              self.columns[column].weight = 1000 + value.to_s(2).size
+            end
+          end
+        end
+        
+        def _load_action_columns_with_bitfields
+          self.model.bitfields.each do |column_name, options|
+            columns = options.keys.sort_by { |column| self.columns[column].weight }
+            [:create, :update, :show, :subform].each do |action|
+              self.send(action).columns.add_subgroup(column_name) { |group| group.add *columns }
+            end
+          end if self.model.respond_to?(:bitfields) and self.model.bitfields.present?
+          
+          _load_action_columns_without_bitfields
+        end
+          
+
+        def self.included(base)
+          base.alias_method_chain :initialize, :bitfields
+          base.alias_method_chain :_load_action_columns, :bitfields
+        end
+      end
+    end
+  end
+end

data/lib/active_scaffold/bridges/bitfields.rb

@@ -0,0 +1,6 @@
+class ActiveScaffold::Bridges::Bitfields < ActiveScaffold::DataStructures::Bridge
+  def self.install
+    require File.join(File.dirname(__FILE__), "bitfields/bitfields_bridge")
+    ActiveScaffold::Config::Core.send :include, ActiveScaffold::Bridges::Bitfields::BitfieldsBridge
+  end
+end

data/lib/active_scaffold/bridges/calendar_date_select/as_cds_bridge.rb

@@ -44,7 +44,7 @@ module ActiveScaffold
              :class => 'text-input',
              :id => "#{options[:id]}_#{name}",
              :time => column_datetime?(column) ? true : false,
-             :style => "display:#{(options[:show].nil? || options[:show]) ? '' : 'none'}"})
+             :style => (options[:show].nil? || options[:show]) ? nil : "display: none"})
         end
       end
     end

data/lib/active_scaffold/bridges/cancan/cancan_bridge.rb

@@ -1,3 +1,23 @@
+# Allow users to easily define aliases for AS actions.
+# Ability#as_action_aliases should be called by the user in his ability class
+# 
+#     class Ability < CanCan::Ability
+#       def initialize(user)
+#         as_action_aliases
+#       end
+#     end
+#
+module CanCan
+  module Ability
+    def as_action_aliases
+      alias_action :list, :row, :show_search, :render_field, :to => :read
+      alias_action :update_column, :add_association, :edit_associated, 
+        :edit_associated, :new_existing, :add_existing, :to => :update
+      alias_action :delete, :destroy_existing, :to => :destroy
+    end
+  end
+end
+
 module ActiveScaffold::Bridges
   class Cancan
 

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

@@ -157,7 +157,7 @@ module ActiveScaffold::Bridges
           options = column.options.merge(options).except!(:include_blank, :discard_time, :discard_date, :value)
           options = active_scaffold_input_text_options(options.merge(column.options))
           options[:class] << " #{column.search_ui.to_s}"
-          options[:style] = "display:#{(options[:show].nil? || options[:show]) ? '' : 'none'}"
+          options[:style] = (options[:show].nil? || options[:show]) ? nil : "display: none"
           format = options.delete(:format) || :default
           datepicker_format_options(column, format, options)
           text_field_tag("#{options[:name]}[#{name}]", value ? l(value, :format => format) : nil, options.merge(:id => "#{options[:id]}_#{name}", :name => "#{options[:name]}[#{name}]"))

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

@@ -30,7 +30,7 @@ class ActiveScaffold::Bridges::RecordSelect
         # if the opposite association is a :belongs_to (in that case association in this class must be has_one or has_many)
         # then only show records that have not been associated yet
         if [:has_one, :has_many].include?(column.association.macro)
-          params.merge!({column.association.primary_key_name => ''})
+          params.merge!({column.association.foreign_key => ''})
         end
  
         record_select_options = active_scaffold_input_text_options(options).merge(

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

@@ -28,8 +28,8 @@ module ActiveScaffold
             numeric_controls = "" << 
             active_scaffold_search_date_bridge_calendar_control(column, options, current_search, 'from') <<
             content_tag(:span, (" - " + active_scaffold_search_date_bridge_calendar_control(column, options, current_search, 'to')).html_safe,
-              :id => "#{options[:id]}_between", :class => "as_search_range_between", :style => "display:#{current_search['opt'] == 'BETWEEN' ? '' : 'none'}")  
-            content_tag("span", numeric_controls.html_safe, :id => "#{options[:id]}_numeric", :style => "display:#{ActiveScaffold::Finder::NumericComparators.include?(current_search['opt']) ? '' : 'none'}")
+              :id => "#{options[:id]}_between", :class => "as_search_range_between", :style => current_search['opt'] == 'BETWEEN' ? nil : "display: none")
+            content_tag("span", numeric_controls.html_safe, :id => "#{options[:id]}_numeric", :style => ActiveScaffold::Finder::NumericComparators.include?(current_search['opt']) ? nil : "display: none")
           end
   
           def active_scaffold_search_date_bridge_trend_tag(column, options, current_search)
@@ -45,7 +45,7 @@ module ActiveScaffold
             select_tag("#{trend_options[:name_prefix]}[#{column.name}][unit]",
              options_for_select(active_scaffold_search_date_bridge_trend_units(column), trend_options[:unit_value]),
              :class => 'text-input')
-            content_tag("span", trend_controls.html_safe, :id => "#{options[:id]}_trend", :style => "display:#{trend_options[:show] ? '' : 'none'}")
+            content_tag("span", trend_controls.html_safe, :id => "#{options[:id]}_trend", :style => trend_options[:show] ? nil : "display: none")
           end
 
           def active_scaffold_search_date_bridge_trend_units(column)
@@ -58,7 +58,7 @@ module ActiveScaffold
             range_controls = select_tag("search[#{column.name}][range]", 
               options_for_select( ActiveScaffold::Finder::DateRanges.collect{|range| [as_(range.downcase.to_sym), range]}, current_search["range"]), 
              :class => 'text-input')
-            content_tag("span", range_controls.html_safe, :id => "#{options[:id]}_range", :style => "display:#{(current_search['opt'] == 'RANGE') ? '' : 'none'}")
+            content_tag("span", range_controls.html_safe, :id => "#{options[:id]}_range", :style => (current_search['opt'] == 'RANGE') ? nil : "display: none")
           end
           
           def column_datetime?(column)

data/lib/active_scaffold/config/list.rb

@@ -142,6 +142,11 @@ 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
@@ -173,17 +178,20 @@ module ActiveScaffold::Config
       end
 
       def sorting
-        # 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
+        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
         end
+        @sorting
       end
       
       def count_includes

data/lib/active_scaffold/data_structures/sorting.rb

@@ -95,7 +95,7 @@ module ActiveScaffold::DataStructures
         sql = sort_column.sort[:sql]
         next if sql.nil? or sql.empty?
 
-        order << "#{sql} #{sort_direction}"
+        order << Array(sql).map {|column| "#{column} #{sort_direction}"}.join(', ')
       end
 
       order.join(', ') unless order.empty?

data/lib/active_scaffold/finder.rb

@@ -265,7 +265,7 @@ module ActiveScaffold
       full_includes = (active_scaffold_includes.blank? ? nil : active_scaffold_includes)
 
       # create a general-use options array that's compatible with Rails finders
-      finder_options = { :order => options[:sorting].try(:clause),
+      finder_options = { :reorder => options[:sorting].try(:clause),
                          :where => search_conditions,
                          :joins => joins_for_finder,
                          :includes => full_includes}
@@ -278,7 +278,7 @@ module ActiveScaffold
     # See finder_options for valid options
     def count_options(find_options = {}, count_includes = nil)
       count_includes ||= find_options[:includes] unless find_options[:where].nil?
-      options = find_options.reject{|k,v| [:select, :order].include? k}
+      options = find_options.reject{|k,v| [:select, :reorder].include? k}
       options[:includes] = count_includes
       options
     end
@@ -320,14 +320,8 @@ module ActiveScaffold
     end
     
     def append_to_query(query, options)
-      options.assert_valid_keys :where, :select, :group, :order, :limit, :offset, :joins, :includes, :lock, :readonly, :from
+      options.assert_valid_keys :where, :select, :group, :reorder, :limit, :offset, :joins, :includes, :lock, :readonly, :from
       options.reject{|k, v| v.blank?}.inject(query) do |query, (k, v)|
-        # default ordering of model has a higher priority than current queries ordering
-        # fix this by removing existing ordering from arel
-        if k.to_sym == :order
-          query = query.where('1=1') unless query.is_a?(ActiveRecord::Relation)
-          query = query.except(:order)
-        end
         query.send((k.to_sym), v) 
       end
     end

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.foreign_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.foreign_key].column.try(:null)
         else
           column.column.try(:null)
         end
@@ -182,7 +182,7 @@ module ActiveScaffold
         html << ' ' << text_field_tag("#{options[:name]}[from]", from_value, active_scaffold_input_text_options(:id => options[:id], :size => text_field_size))
         html << ' ' << content_tag(:span, (' - ' + text_field_tag("#{options[:name]}[to]", to_value,
               active_scaffold_input_text_options(:id => "#{options[:id]}_to", :size => text_field_size))).html_safe,
-              :id => "#{options[:id]}_between", :class => "as_search_range_between", :style => "display:#{(opt_value == 'BETWEEN') ? '' : 'none'}")
+              :id => "#{options[:id]}_between", :class => "as_search_range_between", :style => (opt_value == 'BETWEEN') ? nil : "display: none")
         content_tag :span, html, :class => 'search_range'
       end
       alias_method :active_scaffold_search_integer, :active_scaffold_search_range

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -210,6 +210,11 @@ module ActiveScaffold
         end
       end
 
+      def list_row_class(record)
+        class_override_helper = :"#{clean_class_name(record.class.name)}_list_row_class"
+        respond_to?(class_override_helper) ? send(class_override_helper, record) : ''
+      end
+      
       def column_class(column, column_value, record)
         classes = []
         classes << "#{column.name}-column"

data/lib/active_scaffold/version.rb

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

data/lib/active_scaffold.rb

@@ -271,8 +271,8 @@ module ActiveScaffold
           
           ActiveScaffold::DataStructures::ActionLink.new('index', options) #unless column.through_association?
         else
-          actions = [:create, :update, :show] 
           actions = controller.active_scaffold_config.actions unless controller == :polymorph
+          actions ||= [:create, :update, :show] 
           column.actions_for_association_links.delete :new unless actions.include? :create
           column.actions_for_association_links.delete :edit unless actions.include? :update
           column.actions_for_association_links.delete :show unless actions.include? :show

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 3
   - 2
-  - 0
-  version: 3.2.0
+  - 1
+  version: 3.2.1
 platform: ruby
 authors: 
 - Many, see README
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-14 00:00:00 Z
+date: 2012-03-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -27,12 +28,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-  prerelease: false
-  type: :development
+  version_requirements: *id001
   name: shoulda
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -43,12 +44,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id002
-  prerelease: false
-  type: :development
+  version_requirements: *id002
   name: bundler
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,12 +58,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-  prerelease: false
-  type: :development
+  version_requirements: *id003
   name: rcov
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -73,10 +74,9 @@ dependencies:
         - 1
         - 3
         version: 3.1.3
-  requirement: *id004
-  prerelease: false
-  type: :runtime
+  version_requirements: *id004
   name: rails
+  prerelease: false
 description: Save time and headaches, and create a more easily maintainable set of pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read, update, delete) user interface needs, leaving you more time to focus on more challenging (and interesting!) problems.
 email: activescaffold@googlegroups.com
 executables: []
@@ -86,10 +86,10 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- app/assets/images/active_scaffold/add.gif
-- app/assets/images/active_scaffold/arrow_down.gif
-- app/assets/images/active_scaffold/arrow_up.gif
-- app/assets/images/active_scaffold/close.gif
+- app/assets/images/active_scaffold/add.png
+- app/assets/images/active_scaffold/arrow_down.png
+- app/assets/images/active_scaffold/arrow_up.png
+- app/assets/images/active_scaffold/close.png
 - app/assets/images/active_scaffold/close_touch.png
 - app/assets/images/active_scaffold/config.png
 - app/assets/images/active_scaffold/cross.png
@@ -108,7 +108,7 @@ files:
 - app/assets/javascripts/prototype/form_enhancements.js
 - app/assets/javascripts/prototype/rico_corner.js
 - app/assets/javascripts/prototype/tiny_mce_bridge.js
-- app/assets/stylesheets/active_scaffold-ie.css
+- app/assets/stylesheets/active_scaffold-ie.css.scss
 - app/assets/stylesheets/active_scaffold.css.scss
 - app/assets/stylesheets/active_scaffold_colors.css.scss
 - app/assets/stylesheets/active_scaffold_extensions.css.erb
@@ -201,6 +201,8 @@ files:
 - lib/active_scaffold/bridges.rb
 - lib/active_scaffold/bridges/ancestry.rb
 - lib/active_scaffold/bridges/ancestry/ancestry_bridge.rb
+- lib/active_scaffold/bridges/bitfields.rb
+- lib/active_scaffold/bridges/bitfields/bitfields_bridge.rb
 - lib/active_scaffold/bridges/calendar_date_select.rb
 - lib/active_scaffold/bridges/calendar_date_select/as_cds_bridge.rb
 - lib/active_scaffold/bridges/cancan.rb

data/app/assets/stylesheets/active_scaffold-ie.css

@@ -1,35 +0,0 @@
-/* IE hacks
-   ==================================== */
-
-* html .active-scaffold-header,
-.active-scaffold li.form-element,
-.active-scaffold li.sub-section {
-zoom: 1;
-}
-
-* html .active-scaffold td .messages-container {
-border-top: solid 1px #DAFFCD;
-}
-
-* html .active-scaffold-header div.actions a.show_search {
-background-image: none;
-filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../../../images/active_scaffold/default/magnifier.png', sizingMethod='crop');
-}
-
-* html .active-scaffold .sub-form .association-record a.destroy {
-background-image: none;
-filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../../../images/active_scaffold/default/cross.png', sizingMethod='crop');
-}
-
-.active-scaffold-header div.actions a.disabled {
-filter: alpha(opacity=50);
-}
-
-.active-scaffold .show-view dd,
-.active-scaffold li.form-element dd {
-float: none;
-}
-
-.active-scaffold li.form-element dt {
-padding: 4px 0;
-}