active_scaffold 3.3.0.rc3 → 3.3.0

data/CHANGELOG

@@ -1,6 +1,6 @@
-= master
+= 3.3.0
 - Unify field overrides and list_ui method signatures
-- Improve performance removing some partials and adding some caching for helper overrides and UIs, and caching url generation for lists (optional)
+- Improve performance removing some partials and adding some caching for helper overrides and UIs, and caching url generation for lists (caching url is optional)
 - Drop support for rails 3.1
 - Add HTML5 form fields
 - Add :chosen form_ui, and :chosen and :multi_chosen search_ui
@@ -26,8 +26,20 @@
 - 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)
+- Allow to include header on list refreshing
+- Add search_joins to columns, so it's possible to do left joins without loading associations only for searching
+- Fix set focus for inplace edit clone and ajax
+- Allow to override label for list column headings with a new helper method column_heading_label
+- Keep focus on last field when render_field is called
+- Add empty create and update methods to tableless
+- Allow multiple subform levels
+
+= 3.2.20
+- Some fixes for ruby 1.9
+- Some fixes for rails 3.1
+- Fix detection of empty for has_and_belongs_to_many on subforms
+
+= 3.2.19
 - Avoid crashing when between is chosen and from or to is not filled
 
 = 3.2.18

data/README.md

@@ -0,0 +1,67 @@
+Overview
+========
+ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control. 
+
+Branch Details
+--------------
+rails-3.2 branch on Github supports Rails 3.1 & 3.2, and is the current source of the 3.2.x line of gems. The master branch (3.3.x) has dropped support for Rails 3.1
+
+Quick Start
+-----------
+To get started with a new Rails project
+
+Added to Gemfile
+
+    gem 'active_scaffold'
+
+Run the following commands
+
+    bundle install
+    bundle exec rake db:create
+    rails g active_scaffold User name:string
+    bundle exec rake db:migrate
+
+Add the following line to app/assets/javascripts/application.js
+
+    //= require active_scaffold
+
+Add the following line to /app/assets/stylesheets/application.css
+
+    *= require active_scaffold
+
+Run the app and visit localhost:3000/teams 
+
+Configuration
+-------------
+See Wiki for instructions on customising ActiveScaffold and to find the full API details.
+
+Compatability Issues
+--------------------
+jQuery 1.9 deprecates some methods that rails-3.2 branch still uses (NB: jQuery 1.9 is supported in 3.3.x, the master branch). You'll therefore need to ensure you use jQuery 1.8. You can do this by fixing version in your Gemfile:
+
+    gem 'jquery-rails', '2.1.4'
+
+active_scaffold_batch plugin gem (versions 3.2.x) require 3.3.x (master branch). Therefore if you wish to try using active_scaffold_batch with this branch, you'll need to fork the project and edit the runtime dependency in the gemspec file (use at your own discretion)
+
+Credits
+-------
+ActiveScaffold grew out of a project named Ajaxscaffold dating back to 2006. It has had numerous contributors including:
+
+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)
+http://codinginparadise.org
+
+Uses Querystring by Adam Vandenberg
+http://adamv.com/dev/javascript/querystring
+
+Uses Paginator by Bruce Williams
+http://paginator.rubyforge.org/
+
+Supports RecordSelect by Lance Ivy
+http://code.google.com/p/recordselect/
+
+
+License
+=======
+Released under the MIT license (included)

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

@@ -5,6 +5,7 @@ jQuery(document).ready(function($) {
     else alert(error);
   }
 
+  jQuery(document).on('focus', ':input', function() { ActiveScaffold.last_focus = this; });
   jQuery(document).click(function(event) {
     jQuery('.action_group.dyn ul').remove();
   });
@@ -364,6 +365,7 @@ if (typeof(jQuery.fn.delayedObserver) === 'undefined') {
  */
 
 var ActiveScaffold = {
+  last_focus: null,
   records_for: function(tbody_id) {
     if (typeof(tbody_id) == 'string') tbody_id = '#' + tbody_id;
     return jQuery(tbody_id).children('.record');
@@ -441,7 +443,7 @@ var ActiveScaffold = {
   replace: function(element, html) {
     if (typeof(element) == 'string') element = '#' + element; 
     element = jQuery(element);
-    var new_element = typeof(html) == 'string' ? jQuery.parseHTML(html.trim()) : html;
+    var new_element = typeof(html) == 'string' ? jQuery.parseHTML(html.trim(), true) : html;
     new_element = jQuery(new_element);
     element.replaceWith(new_element);
     new_element.trigger('as:element_updated');
@@ -554,13 +556,10 @@ var ActiveScaffold = {
     row = jQuery(row);
     var tbody = row.closest('tbody.records');
     
-    var current_action_node = row.find('td.actions a.disabled').first();
-    if (current_action_node) {
-      var action_link = ActiveScaffold.ActionLink.get(current_action_node);
-      if (action_link) {
-        action_link.close_previous_adapter();
-      }
-    }
+    row.find('a.disabled').each(function() {;
+      var action_link = ActiveScaffold.ActionLink.get(this);
+      if (action_link) action_link.close();
+    });
     
     ActiveScaffold.remove(row, function() {
       ActiveScaffold.stripe(tbody);
@@ -678,7 +677,7 @@ var ActiveScaffold = {
     content = jQuery(content);
     if (options.singular == false) {
       if (!(options.id && jQuery('#' + options.id).size() > 0)) {
-        var tfoot = element.find('tfoot');
+        var tfoot = element.children('tfoot');
         if (tfoot.length) tfoot.before(content);
         else element.append(content);
         content.trigger('as:element_created');
@@ -860,6 +859,7 @@ var ActiveScaffold = {
       complete: function(event) {
         element.nextAll('img.loading-indicator').css('visibility','hidden');
         ActiveScaffold.enable_form(as_form);
+        if (ActiveScaffold.last_focus) $(ActiveScaffold.last_focus).focus().select();
       },
       error: function (xhr, status, error) {
         var as_div = element.closest("div.active-scaffold");

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

@@ -1,7 +1,7 @@
 <%
   scope ||= nil
   subsection_id ||= nil
-  show_unauthorized_columns = active_scaffold_config.send(form_action).show_unauthorized_columns
+  show_unauthorized_columns = active_scaffold_config.send(form_action).show_unauthorized_columns if active_scaffold_config.actions.include? form_action
 %>
 <ol class="form" <%= "id=#{subsection_id}" unless subsection_id.nil? %> <%= "style=\"display: none;\"".html_safe if columns.collapsed %>>
   <% columns.each :for => @record, :crud_type => (:read if show_unauthorized_columns) do |column| %>
@@ -15,13 +15,13 @@
     <%= render :partial => 'form', :locals => { :columns => column, :subsection_id => subsection_id, :form_action => form_action, :scope => scope } %>
     <%= link_to_visibility_toggle(subsection_id, {:default_visible => !column.collapsed}) -%>
   </li>
-  <% elsif renders_as == :subform and !override_form_field?(column) and authorized -%>
+  <% elsif renders_as == :subform and authorized -%>
   <li class="sub-form <%= active_scaffold_config_for(column.association.klass).subform.layout %>-sub-form <%= column_css_class %> <%=column.name%>-sub-form" id="<%= sub_form_id(:association => column.name) %>">
-    <%=raw render :partial => form_partial_for_column(column, renders_as), :locals => { :column => column, :scope => scope } -%>
+    <%= render_column(column, @record, renders_as, scope) %>
   </li>
   <% else -%>
   <li class="form-element <%= 'required' if column.required? %> <%= column_css_class %>">
-    <%=raw render :partial => form_partial_for_column(column, renders_as), :locals => { :column => column, :only_value => !authorized, :scope => scope } -%>
+    <%= render_column(column, @record, renders_as, scope, !authorized) %>
   </li>
   <% end -%>
   <% end -%>

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

@@ -5,8 +5,9 @@ associated = associated.sort_by {|r| r.new_record? ? 99999999999 : r.id} unless
 if show_blank_record = column.show_blank_record?(associated)
   associated << build_associated(column, parent_record)
 end
+disable_required_for_new = @disable_required_for_new
 @disable_required_for_new = show_blank_record unless (column.singular_association? && column.required?)
-subform_div_id = "#{sub_form_id({:association => column.name, :id => parent_record.id || 99999999999})}-div" 
+subform_div_id = "#{sub_form_id(:association => column.name, :id => parent_record.id || generated_id(parent_record) || 99999999999)}-div" 
 -%>
 <h5><%= column.label -%></h5>
 <div id ="<%= subform_div_id %>" <%= 'style="display: none;"'.html_safe if column.collapsed -%>>
@@ -18,5 +19,5 @@ subform_div_id = "#{sub_form_id({:association => column.name, :id => parent_reco
 <%= link_to_visibility_toggle(subform_div_id, {:default_visible => !column.collapsed}) -%>
 <%
   @record = parent_record
-  @disable_required_for_new = nil
+  @disable_required_for_new = disable_required_for_new
 -%>

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

@@ -11,8 +11,10 @@ show_add_new = column_show_add_new(column, associated, @record)
 
 return unless show_add_new or show_add_existing
 
-edit_associated_url = params_for(:action => 'edit_associated', :child_association => column.name, :associated_id => '--ID--', :scope => scope) if show_add_existing
-add_new_url = params_for(:action => 'edit_associated', :child_association => column.name, :scope => scope) if show_add_new
+temporary_id = generated_id(parent_record) if parent_record.new_record?
+controller_path = active_scaffold_controller_for(parent_record.class).controller_path
+edit_associated_url = params_for(:controller => controller_path, :action => 'edit_associated', :child_association => column.name, :associated_id => '--ID--', :scope => scope, :id => parent_record.id, :generated_id => temporary_id, :parent_controller => controller.controller_path) if show_add_existing
+add_new_url = params_for(:controller => controller_path, :action => 'edit_associated', :child_association => column.name, :scope => scope, :id => parent_record.id, :generated_id => temporary_id, :parent_controller => controller.controller_path) if show_add_new
 
 -%>
 <div class="footer-wrapper">
@@ -25,7 +27,7 @@ add_new_url = params_for(:action => 'edit_associated', :child_association => col
          add_label = as_(:replace_with_new)
          add_class = 'as_replace_with_new'
        end
-       create_another_id = "#{sub_form_id(:association => column.name)}-create-another" %>
+       create_another_id = "#{sub_form_id(:association => column.name, :id => parent_record.id || temporary_id || 99999999999)}-create-another" %>
     <%= link_to add_label, add_new_url, :id => create_another_id, :remote => true, :class => add_class, :style=> "display: none;" %>
     <%= javascript_tag("ActiveScaffold.show('#{create_another_id}');") %>
     <% end -%>
@@ -37,7 +39,7 @@ add_new_url = params_for(:action => 'edit_associated', :child_association => col
         <%= link_to_record_select as_(:add_existing), remote_controller.controller_path, :onselect => "ActiveScaffold.record_select_onselect(#{url_for(edit_associated_url).to_json}, #{active_scaffold_id.to_json}, id);" -%>
       <% else -%>
         <% select_options = options_from_collection_for_select(sorted_association_options_find(column.association), :id, :to_label)
-           add_existing_id = "#{sub_form_id(:association => column.name)}-add-existing"
+           add_existing_id = "#{sub_form_id(:association => column.name, :id => parent_record.id || temporary_id || 99999999999)}-add-existing"
            add_existing_label = column.plural_association? ? :add_existing : :replace_existing %>
         <%= select_tag 'associated_id', '<option value="">'.html_safe + as_(:_select_) + '</option>'.html_safe + select_options %>
         <%= link_to as_(add_existing_label), edit_associated_url, :id => add_existing_id, :remote => true, :class=> "as_#{add_existing_label}", :style => "display: none;" %>

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

@@ -1,4 +1,4 @@
-<table cellpadding="0" cellspacing="0" id="<%= sub_form_list_id(:association => column.name) %>">
+<table cellpadding="0" cellspacing="0" id="<%= sub_form_list_id(:association => column.name, :id => parent_record.try(:id) || generated_id(parent_record) || 99999999999) %>">
   <% @record = associated.empty? ? build_associated(column, parent_record) : associated.last -%>
   <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record, :record => @record} %>
 

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

@@ -24,7 +24,7 @@
   </thead>
   <%= render :partial => 'list_messages', :locals => {:columns => columns} %>
   <tbody class="records" id="<%= active_scaffold_tbody_id %>">
-    <% if !@records.empty? -%>
+    <% if !@page.empty? -%>
       <%= render :partial => 'list_record', :collection => @page.items, :locals => {:hidden => false, :columns => columns, :action_links => active_scaffold_config.action_links.member, :data_refresh => url_for(params_for(:action => :row, :id => '--ID--', :_method => :get))} %>
     <% end -%>
     <% if columns.any? {|c| c.calculation?} -%>

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

@@ -20,7 +20,7 @@
         </div>
         <% end -%>
       </div>
-      <p id="<%= empty_message_id %>" class="empty-message" <%= ' style="display:none;" '.html_safe unless @page.items.empty? %>>
+      <p id="<%= empty_message_id %>" class="empty-message" <%= ' style="display:none;" '.html_safe unless @page.empty? %>>
         <%= as_(active_scaffold_config.list.no_entries_message) %>
       </p>
     </td>

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

@@ -1 +1,5 @@
+<% if active_scaffold_config.list.refresh_with_header -%>
+ActiveScaffold.replace('<%= active_scaffold_id %>', '<%= escape_javascript(render('list_with_header')) %>');
+<% else -%>
 ActiveScaffold.replace_html('<%= active_scaffold_content_id %>', '<%= escape_javascript(render('list')) %>');
+<% end -%>

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

@@ -8,7 +8,8 @@
   @rendered ||= Set.new
   return if @rendered.include? column.name
   @rendered << column.name
-  if column_renders_as(column) == :subform
+  renders_as = column_renders_as(column)
+  if renders_as == :subform
     options = {:is_subform => true, :field_class => "#{column.name}-sub-form"}
   else
     options = {:is_subform => false, :field_class => "#{column.name}-input"}
@@ -18,7 +19,7 @@
     crud_type = @record.new_record? ? :create : (readonly ? :read : :update)
     active_scaffold_render_subform_column(column, scope, crud_type, readonly, !active_scaffold_config.subform.columns.names_without_auth_check.include?(column.name))
   else
-    render(:partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope })
+    render_column(column, @record, renders_as, scope)
   end
 -%>
 

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

@@ -1,4 +1,4 @@
-<div id="<%= sub_form_list_id(:association => column.name) %>">
+<div id="<%= sub_form_list_id(:association => column.name, :id => parent_record.id || generated_id(parent_record) || 99999999999) %>">
   <% associated.each_index do |index| %>
   <% @record = associated[index] -%>
   <%= render :partial => 'form_association_record', :locals => {:scope => column_scope(column, scope), :parent_record => parent_record, :column => column, :locked => show_blank_record && @record.new_record? && @record == associated.last, :index => index} %>

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

@@ -9,4 +9,4 @@ else
     options[:id] = active_scaffold_input_options(column, @scope)[:id]
   end
 end %>
-ActiveScaffold.create_associated_record_form('<%=sub_form_list_id(:association => @column.name)%>','<%=escape_javascript(associated_form)%>', <%= options.to_json.html_safe %>);
+ActiveScaffold.create_associated_record_form('<%=sub_form_list_id(:association => @column.name, :id => @parent_record.id || generated_id(@parent_record) || 99999999999)%>','<%=escape_javascript(associated_form)%>', <%= options.to_json.html_safe %>);

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

@@ -1,10 +1,11 @@
 try {
+var action_link;
 <% form_selector = "#{element_form_id(:action => :create)}"
 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 = ActiveScaffold.find_action_link('<%= form_selector %>');
 action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'messages')) %>');
 <% end -%>
 <% if controller.send :successful? -%>

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

@@ -1 +1,6 @@
-<%= active_scaffold_input_for(active_scaffold_config.columns[@column.name]) %>
+<%
+  column = active_scaffold_config.columns[@column.name]
+  options = active_scaffold_input_options(column)
+  options[:class] = "#{options[:class]} inplace_field"
+-%>
+<%= active_scaffold_input_for(column, nil, options) %>

data/config/locales/ru.yml

@@ -6,7 +6,7 @@ ru:
     add: 'Добавить запись'
     add_existing: 'Добавить существующую запись'
     add_existing_model: '%{model}: добавить существующую запись'
-    apply: 'Apply'
+    apply: 'Применить'
     are_you_sure_to_delete: 'Удалить %{label}?'
     cancel: 'Отмена'
     click_to_edit: 'Нажмите для редактирования'
@@ -30,7 +30,7 @@ ru:
     nested_of_model: '%{nested_model} @ %{parent_model}'
     'false': 'Нет'
     filtered: '(Найденное)'
-    found: 
+    found:
       one: 'запись'
       few: 'записи'
       many: 'записей'
@@ -56,7 +56,7 @@ ru:
     refresh: 'Обновить'
     remove: 'Удалить'
     remove_file: 'Удалить или заменить файл'
-    replace_existing: 'Replace existing'
+    replace_existing: 'Заменить существующим'
     replace_with_new: 'Заменить новым'
     revisions_for_model: '%{model}: редакции'
     reset: 'Сброс'
@@ -111,13 +111,13 @@ ru:
       firstDay: 1
       isRTL: false
       showMonthAfterYear: false
-      
+
     datetime_picker_options:
-    
+
     human_conditions:
       boolean: "%{column} = %{value}"
       association: "%{column} = %{value}"
-      
+
     errors:
       template:
         header:

data/lib/active_scaffold/actions/core.rb

@@ -8,7 +8,7 @@ module ActiveScaffold::Actions
         rescue_from ActiveScaffold::RecordNotAllowed, ActiveScaffold::ActionNotAllowed, :with => :deny_access
       end
       base.helper_method :nested?
-      base.helper_method :calculate
+      base.helper_method :calculate_query
       base.helper_method :new_model
     end
     def render_field
@@ -185,7 +185,7 @@ module ActiveScaffold::Actions
       respond_to do |type|
         action_formats.each do |format|
           type.send(format) do
-            if respond_to?(method_name = "#{action}_respond_to_#{format}")
+            if respond_to?(method_name = "#{action}_respond_to_#{format}", true)
               send(method_name)
             end
           end

data/lib/active_scaffold/actions/create.rb

@@ -33,6 +33,7 @@ module ActiveScaffold::Actions
 
     def create_respond_to_html
       if params[:iframe]=='true' # was this an iframe post ?
+        do_refresh_list if successful? && active_scaffold_config.create.refresh_list && !render_parent?
         responds_to_parent do
           render :action => 'on_create', :formats => [:js], :layout => false
         end

data/lib/active_scaffold/actions/field_search.rb

@@ -48,19 +48,18 @@ module ActiveScaffold::Actions
         columns = active_scaffold_config.field_search.columns
         search_params.each do |key, value|
           next unless columns.include? key
-          search_condition = self.class.condition_for_column(active_scaffold_config.columns[key], value, text_search)
+          column = active_scaffold_config.columns[key]
+          search_condition = self.class.condition_for_column(column, value, text_search)
           unless search_condition.blank?
+            self.active_scaffold_outer_joins << column.search_joins unless column.includes.present? && list_columns.include?(column)
             self.active_scaffold_conditions << search_condition
-            filtered_columns << active_scaffold_config.columns[key]
+            filtered_columns << column
           end
         end
         unless filtered_columns.blank?
           @filtered = active_scaffold_config.field_search.human_conditions ? filtered_columns : true
         end
 
-        includes_for_search_columns = columns.collect{ |column| column.includes}.flatten.uniq.compact
-        self.active_scaffold_includes.concat includes_for_search_columns
-
         active_scaffold_config.list.user.page = nil
       end
     end

data/lib/active_scaffold/actions/list.rb

@@ -24,7 +24,7 @@ module ActiveScaffold::Actions
       @nested_auto_open = active_scaffold_config.list.nested_auto_open
       respond_to_action(:list)
     end
-    
+
     protected
     def list_respond_to_html
       if embedded?
@@ -49,11 +49,11 @@ module ActiveScaffold::Actions
     def list_respond_to_yaml
       render :text => Hash.from_xml(response_object.to_xml(:only => list_columns_names)).to_yaml, :content_type => Mime::YAML, :status => response_status
     end
-    
+
     def row_respond_to_html
       render(:partial => 'row', :locals => {:record => @record})
     end
-    
+
     def row_respond_to_js
       render :action => 'row'
     end
@@ -61,10 +61,10 @@ module ActiveScaffold::Actions
     # The actual algorithm to prepare for the list view
     def set_includes_for_columns(action = :list)
       @cache_associations = true
-      includes_for_list_columns = active_scaffold_config.send(action).columns.collect{ |c| c.includes }.flatten.uniq.compact
+      includes_for_list_columns = active_scaffold_config.send(action).columns.collect_visible(:flatten => true){ |c| c.includes }.flatten.uniq.compact
       self.active_scaffold_includes.concat includes_for_list_columns
     end
-    
+
     def get_row
       set_includes_for_columns
       klass = beginning_of_chain.includes(active_scaffold_includes)
@@ -97,23 +97,23 @@ module ActiveScaffold::Actions
       end
       @page, @records = page, page.items
     end
-    
+
     def do_refresh_list
       params.delete(:id)
-      do_search if respond_to? :do_search
+      do_search if respond_to? :do_search, true
       do_list
     end
 
     def each_record_in_page
       _page = active_scaffold_config.list.user.page
-      do_search if respond_to? :do_search
+      do_search if respond_to? :do_search, true
       active_scaffold_config.list.user.page = _page
       do_list
       @page.items.each {|record| yield record}
     end
 
     def each_record_in_scope
-      do_search if respond_to? :do_search
+      do_search if respond_to? :do_search, true
       append_to_query(beginning_of_chain, finder_options).all.each {|record| yield record}
     end
 
@@ -133,11 +133,11 @@ module ActiveScaffold::Actions
     def process_action_link_action(render_action = :action_update, crud_type = nil)
       if request.get?
         # someone has disabled javascript, we have to show confirmation form first
-        @record = find_if_allowed(params[:id], :read) if params[:id] && params[:id] && params[:id].to_i > 0
+        @record = find_if_allowed(params[:id], :read) if params[:id] && params[:id].to_i > 0
         respond_to_action(:action_confirmation)
       else
         @action_link = active_scaffold_config.action_links[action_name]
-        if params[:id] && params[:id] && params[:id].to_i > 0
+        if params[:id] && params[:id].to_i > 0
           crud_type ||= (request.post? || request.put?) ? :update : :delete
           set_includes_for_columns
           klass = beginning_of_chain.includes(active_scaffold_includes)
@@ -180,7 +180,7 @@ module ActiveScaffold::Actions
     def action_update_respond_to_yaml
       render :text => successful? ? "" : Hash.from_xml(response_object.to_xml(:only => list_columns_names)).to_yaml, :content_type => Mime::YAML, :status => response_status
     end
-     
+
     private
     def list_authorized_filter
       raise ActiveScaffold::ActionNotAllowed unless list_authorized?
@@ -204,7 +204,7 @@ module ActiveScaffold::Actions
     end
 
     def list_columns
-      active_scaffold_config.list.columns.collect_visible
+      @list_columns ||= active_scaffold_config.list.columns.collect_visible
     end
 
     def list_columns_names

data/lib/active_scaffold/actions/mark.rb

@@ -28,7 +28,7 @@ module ActiveScaffold::Actions
 
     def mark_respond_to_js
       if params[:id]
-        do_search if respond_to? :do_search
+        do_search if respond_to? :do_search, true
         set_includes_for_columns if active_scaffold_config.actions.include? :list
         @page = find_page(:pagination => active_scaffold_config.mark.mark_all_mode != :page)
         render :action => 'on_mark'

data/lib/active_scaffold/actions/search.rb

@@ -29,8 +29,8 @@ module ActiveScaffold::Actions
         @filtered = !search_conditions.blank?
         self.active_scaffold_conditions.concat search_conditions if @filtered
 
-        includes_for_search_columns = columns.collect{ |column| column.includes}.flatten.uniq.compact
-        self.active_scaffold_includes.concat includes_for_search_columns
+        outer_joins = columns.collect{ |column| column.search_joins unless column.includes.present? && list_columns.include?(column)}
+        self.active_scaffold_outer_joins.concat outer_joins.flatten.uniq.compact
 
         active_scaffold_config.list.user.page = nil
       end

data/lib/active_scaffold/actions/show.rb

@@ -11,13 +11,13 @@ module ActiveScaffold::Actions
         do_show
         respond_to_action(:show)
       else
-        @record = find_if_allowed(params[:id], :read) if params[:id] && params[:id] && params[:id].to_i > 0
+        @record = find_if_allowed(params[:id], :read) if params[:id] && params[:id].to_i > 0
         action_confirmation_respond_to_html(:destroy)
       end
     end
 
     protected
-    
+
     def show_respond_to_json
       render :text => response_object.to_json(:only => active_scaffold_config.show.columns.names), :content_type => Mime::JSON, :status => response_status
     end
@@ -53,7 +53,7 @@ module ActiveScaffold::Actions
     def show_ignore?(record = nil)
       !self.send(:authorized_for?, :crud_type => :read)
     end
-    private 
+    private
     def show_authorized_filter
       link = active_scaffold_config.show.link || active_scaffold_config.show.class.link
       raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method)

data/lib/active_scaffold/actions/subform.rb

@@ -9,6 +9,7 @@ module ActiveScaffold::Actions
 
     def do_edit_associated
       @parent_record = params[:id].nil? ? new_model : find_if_allowed(params[:id], :update)
+      generate_temporary_id(@parent_record, params[:generated_id]) if @parent_record.new_record? && params[:generated_id]
       @column = active_scaffold_config.columns[params[:child_association]]
 
       # NOTE: we don't check whether the user is allowed to update this record, because if not, we'll still let them associate the record. we'll just refuse to do more than associate, is all.
@@ -16,7 +17,7 @@ module ActiveScaffold::Actions
       @record ||= build_associated(@column, @parent_record)
 
       @scope = "#{params[:scope]}[#{@column.name}]"
-      @scope += (@record.new_record?) ? "[#{(Time.now.to_f*1000).to_i.to_s}]" : "[#{@record.id}]" if @column.plural_association?
+      @scope += "[#{@record.id || generate_temporary_id(@record)}]" if @column.plural_association?
     end
 
   end

data/lib/active_scaffold/actions/update.rb

@@ -34,6 +34,7 @@ module ActiveScaffold::Actions
     end
     def update_respond_to_html
       if params[:iframe]=='true' # was this an iframe post ?
+        do_refresh_list if successful? && active_scaffold_config.create.refresh_list && !render_parent?
         responds_to_parent do
           render :action => 'on_update', :formats => [:js], :layout => false
         end

data/lib/active_scaffold/attribute_params.rb

@@ -212,16 +212,20 @@ module ActiveScaffold
         next true if column and ignore_column_types.include?(column.type)
 
         # defaults are pre-filled on the form. we can't use them to determine if the user intends a new row.
-        next true if column and value == column.default.to_s
+        next true if value == column_default_value(column_name, klass, column)
 
         if value.is_a?(Hash)
           attributes_hash_is_empty?(value, klass)
         elsif value.is_a?(Array)
-          value.any? {|id| id.respond_to?(:empty?) ? !id.empty? : true}
+          value.all?(&:blank?)
         else
           value.respond_to?(:empty?) ? value.empty? : false
         end
       end
     end
+    
+    def column_default_value(column_name, klass, column)
+      column.default.to_s if column
+    end
   end
 end

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

@@ -19,7 +19,10 @@ module ActiveScaffold
           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 } if self.actions.included? action
+              if self.actions.include? action
+                self.send(action).columns.exclude column_name
+                self.send(action).columns.add_subgroup(column_name) { |group| group.add *columns }
+              end
             end
           end if self.model.respond_to?(:bitfields) and self.model.bitfields.present?
           

data/lib/active_scaffold/bridges/calendar_date_select.rb

@@ -3,7 +3,7 @@ class ActiveScaffold::Bridges::CalendarDateSelect < ActiveScaffold::DataStructur
     # check to see if the old bridge was installed.  If so, warn them
     # we can detect this by checking to see if the bridge was installed before calling this code
        
-    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_calendar_date_select")
+    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_calendar_date_select".send(::ActiveScaffold::METHOD_CONVERSION))
       raise RuntimeError, "We've detected that you have active_scaffold_calendar_date_select_bridge installed.  This plugin has been moved to core.  Please remove active_scaffold_calendar_date_select_bridge to prevent any conflicts"
     end