active_scaffold 3.0.24 → 3.0.25

data/frontends/default/javascripts/jquery/active_scaffold.js

@@ -153,10 +153,13 @@ $(document).ready(function() {
     $(this).prevAll('img.loading-indicator').css('visibility','hidden');
     return true;
   });
-  $('input[type=button].as_add_existing, input[type=button].as_replace_existing').live('ajax:before', function(event) {
-    var url = $(this).attr('href').replace('--ID--', $(this).prev().val());
-    event.data_url = url;
-    return true;
+  $('a.as_add_existing, a.as_replace_existing').live('ajax:before', function(event) {
+    var id = $(this).prev().val();
+    if (id) {
+      if (!$(this).data('href')) $(this).data('href', $(this).attr('href'));
+      $(this).attr('href', $(this).data('href').replace('--ID--', id));
+      return true;
+    } else return false;
   });
   $('input.update_form, select.update_form').live('change', function(event) {
     var element = $(this);

data/frontends/default/javascripts/prototype/active_scaffold.js

@@ -230,7 +230,7 @@ document.observe("dom:loaded", function() {
     if(loading_indicator) loading_indicator.style.visibility = 'hidden';  
     return true;
   });
-  document.on('ajax:before', 'input[type=button].as_add_existing, input[type=button].as_replace_existing', function(event) {
+  document.on('ajax:before', 'a.as_add_existing, a.as_replace_existing', function(event) {
     var button = event.findElement();
     var url =  button.readAttribute('href').sub('--ID--', button.previous().getValue());
     event.memo.url = url;

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

@@ -26,7 +26,7 @@ add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :as
          add_class = 'as_replace_with_new'
        end
        create_another_id = "#{sub_form_id(:association => column.name)}-create-another" %>
-    <%= tag(:input, {:id => create_another_id, :type => 'button', :value => add_label, :href => add_new_url.html_safe, 'data-remote' => true, :class => add_class, :style=> "display: none;"}) %>
+    <%= 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 -%>
 
@@ -39,7 +39,7 @@ add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :as
         <% select_options = options_for_select(options_for_association(column.association)) 
            add_existing_id = "#{sub_form_id(:association => column.name)}-add-existing" %>
         <%= select_tag 'associated_id', '<option value="">'.html_safe + as_(:_select_) + '</option>'.html_safe + select_options %>
-        <%= tag(:input, {:id => add_existing_id, :type => 'button', :value => as_(:add_existing), :href => edit_associated_url.html_safe, 'data-remote' => true, :class=> column.plural_association? ? 'as_add_existing' : 'as_replace_existing', :style => "display: none;"}) %>
+        <%= link_to as_(:add_existing), edit_associated_url, :id => add_existing_id, :remote => true, :class=> column.plural_association? ? 'as_add_existing' : 'as_replace_existing', :style => "display: none;" %>
         <%= javascript_tag("ActiveScaffold.show('#{add_existing_id}');") %>
       <% end -%>
     <% end -%>

data/frontends/default/views/_horizontal_subform.html.erb~

@@ -1,6 +1,6 @@
 <table cellpadding="0" cellspacing="0">
   <%
-    record = if associated.empty?
+    @record = if associated.empty?
       if column.singular_association?
         parent_record.send("build_#{column.name}".to_sym)
       else
@@ -10,7 +10,7 @@
       associated.last
     end
   -%>
-  <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record, :record => record} %>
+  <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record, :record => @record} %>
 
   <tbody id="<%= sub_form_list_id(:association => column.name) %>">
     <% associated.each_index do |index| %>
@@ -25,5 +25,8 @@
     <%= render :partial => 'horizontal_subform_record', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column, :locked => show_blank_record && @record.new_record? && @record == associated.last} %>
     <% end -%>
   </tbody>
+  <tfooter>
+    <%= render :partial => 'horizontal_subform_footer', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column} %>
+  </tfooter>
 </table>
 <%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated} -%>

data/frontends/default/views/_horizontal_subform_header.html.erb~

@@ -1,7 +1,7 @@
 <thead>
   <tr>
     <%
-    active_scaffold_config_for(@record.class).subform.columns.each :for => @record.class, :flatten => true do |column|
+    active_scaffold_config_for(record.class).subform.columns.each :for => record.class, :flatten => true do |column|
       hidden = column_renders_as(column) == :hidden
       next unless in_subform?(column, parent_record)
       -%>

data/frontends/default/views/_horizontal_subform_record.html.erb~

@@ -15,7 +15,7 @@
   column = column.clone
   column.form_ui ||= :select if column.association
 -%>
-  <td class="<%= 'hidden' if column_renders_as(column) == :hidden %>">
+  <td<%= ' class="hidden"'.html_safe if column_renders_as(column) == :hidden %>>
     <% unless readonly and not @record.new_record? or not @record.authorized_for?(:crud_type => crud_type, :column => column.name) -%>
       <%= render :partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope } -%>
     <% else -%>

data/frontends/default/views/_list_with_header.html.erb~

@@ -0,0 +1,32 @@
+<div id="<%= active_scaffold_id -%>" class="<%= as_main_div_class %>" <%= "data-eid=#{id_from_controller(params[:eid])}" if params[:eid]%>>
+  <div class="active-scaffold-header">
+    <%= render :partial => 'list_header' %>
+  </div>
+  <table cellpadding="0" cellspacing="0">
+    <tbody class="before-header" id="<%= before_header_id -%>">
+      <% if active_scaffold_config.list.always_show_search %>
+        <tr>
+          <td>
+            <div class="active-scaffold show_search-view <%= "#{params[:controller]}-view" %> view">
+              <%= render :partial => active_scaffold_config.list.search_partial %>
+            </div> 
+          </td> 
+        </tr>
+      <% else %>
+      <tr><td></td></tr>
+      <% end %>
+      <% if !nested? && active_scaffold_config.list.always_show_create %>
+        <tr> 
+          <td> 
+            <div  class="active-scaffold create-view <%= "#{params[:controller]}-view" %> view">
+              <%= render :partial => 'create_form_on_list' %>
+            </div> 
+          </td> 
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+  <div id="<%= active_scaffold_content_id-%>" class="as_content">
+    <%= render :partial => 'list' %>
+  </div>
+</div>

data/frontends/default/views/_show.html.erb~

@@ -0,0 +1,8 @@
+<h4><%= active_scaffold_config.show.label(@record.to_label.nil? ? nil : clean_column_value(@record.to_label)) %></h4>
+
+<%= render :partial => 'show_columns', :locals => {:columns => active_scaffold_config.show.columns} -%>
+
+<p class="form-footer">
+  <%= link_to as_(:close), main_path_to_return, :class => 'as_cancel', :remote => request.xhr?, 'data-refresh' => false %>
+  <%= loading_indicator_tag(:action => :create, :id => params[:id]) %>
+</p>

data/frontends/default/views/_update_form.html.erb~

@@ -0,0 +1,6 @@
+<% cancel_link = true if cancel_link.nil? %>
+<%= render :partial => "base_form", :locals => {:xhr => xhr ||= nil,
+                                                :form_action => form_action ||= :update,
+                                                :method => method ||= :put,
+                                                :cancel_link => cancel_link,
+                                                :headline => headline ||= @record.to_label.nil? ? active_scaffold_config.update.label : as_(:update_model, :model => clean_column_value(@record.to_label))} %>

data/frontends/default/views/on_create.js.erb~

@@ -0,0 +1,45 @@
+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').strip)%>');
+<% if controller.send :successful? %>
+  <% if render_parent? && controller.respond_to?(:render_component_into_view) %>
+    <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
+    <% if nested_singular_association? %>
+      action_link.close('<%= escape_javascript(parent_rendered)%>');
+    <% else %>
+      <% if render_parent_action == :row %>
+        ActiveScaffold.create_record_row(action_link.scaffold(),'<%=  escape_javascript(parent_rendered)%>', <%= {:insert_at => insert_at}.to_json.html_safe %>);
+      <% elsif render_parent_action == :index %>
+        <%= escape_javascript(parent_rendered) %>
+      <% end %>
+      action_link.close();
+    <% end %>
+    <%#page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
+  <% elsif (active_scaffold_config.create.refresh_list) %>
+    ActiveScaffold.replace_html(<%= active_scaffold_content_id%>, <%= escape_javascript(render(:partial => 'list', :layout => false)) %>);
+  <% 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%>);
+    <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
+      ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
+    <% end %>
+  <% end %>
+
+  <% unless render_parent? %>
+    <% if (active_scaffold_config.create.persistent) %>
+      action_link.reload();
+    <% else %>
+      action_link.close();
+    <% end %>
+    <% if (active_scaffold_config.create.action_after_create) %>
+      var link = $('<%=action_link_id active_scaffold_config.create.action_after_create, @record.id%>');
+      if (link) (function() { link.action_link.open() }).defer();
+    <% end %>
+  <% end %>
+<% else %>
+  ActiveScaffold.replace('<%=form_selector%>','<%=escape_javascript(render(:partial => 'create_form', :locals => {:xhr => true}))%>');
+  ActiveScaffold.scroll_to('<%=form_selector%>');
+<% end %>
+} catch (e) { alert('RJS error:\n\n' + e.toString());}

data/frontends/default/views/on_update.js.erb~

@@ -0,0 +1,31 @@
+try {
+<% form_selector = "#{element_form_id(:action => :update)}" %>
+var action_link = ActiveScaffold.find_action_link('<%= form_selector%>');
+action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages').strip)%>');
+<% if controller.send :successful? %>
+  <% if render_parent? && controller.respond_to?(:render_component_into_view) %>
+    <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
+    <% if nested_singular_association? %>
+      action_link.close('<%= escape_javascript(parent_rendered)%>');
+    <% else %>
+      <% if render_parent_action == :row %>
+        action_link.close('<%= escape_javascript(parent_rendered)%>');
+      <% elsif render_parent_action == :index %>
+        <%= escape_javascript(parent_rendered) %>
+      <% end %>
+    <% end %>
+    <%#page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
+  <% elsif update_refresh_list? %>
+    ActiveScaffold.replace_html('<%= active_scaffold_content_id%>', '<%= escape_javascript(render(:partial => 'list', :layout => false))%>');
+   <% else %>
+    <% updated_row = render :partial => 'list_record', :locals => {:record => @record}%>
+    action_link.close('<%= escape_javascript(updated_row)%>');
+    <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
+      ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
+    <% end %>
+  <% end %>
+<% else %>
+  ActiveScaffold.replace('<%=form_selector%>','<%=escape_javascript(render(:partial => 'update_form', :locals => {:xhr => true}))%>');
+  ActiveScaffold.scroll_to('<%=form_selector%>');
+<% end %>
+} catch (e) { alert('RJS error:\n\n' + e.toString());}

data/frontends/default/views/update_column.js.erb~

@@ -0,0 +1,16 @@
+<% @column_span_id ||= element_cell_id(:id => @record.id.to_s, :action => 'update_column', :name => params[:column]) %>
+<% unless controller.send :successful?%>
+  alert('<%= escape_javascript(@record.errors.full_messages.join("\n"))%>');
+  <% @record.reload%>
+<% end%>
+<% column = active_scaffold_config.columns[params[:column]]%>
+<% if column.inplace_edit%>
+  ActiveScaffold.replace_html('<%=@column_span_id%>','<%=escape_javascript(format_inplace_edit_column(@record, column))%>');
+<% else%>
+  <% formatted_value = get_column_value(@record, column)%>
+  ActiveScaffold.replace_html('<%=@column_span_id%>','<%=escape_javascript(formatted_value)%>');
+<% end%>
+<% if column.calculation?%>
+ ActiveScaffold.replace_html('<%=active_scaffold_calculations_id(column)%>', '<%=escape_javascript(render_column_calculation(column))%>');
+<% end%>
+

data/lib/active_scaffold/actions/core.rb~

@@ -36,8 +36,8 @@ module ActiveScaffold::Actions
         @scope = params[:scope]
         
         if column.send_form_on_update_column
-          hash = if params[:scope]
-            params[:scope].gsub('[','').split(']').inject(params[:record]) do |hash, index|
+          hash = if @scope
+            @scope.gsub('[','').split(']').inject(params[:record]) do |hash, index|
               hash[index]
             end
           else
@@ -165,7 +165,7 @@ module ActiveScaffold::Actions
         params = params[:record] || {} unless params[model.inheritance_column] # in create action must be inside record key
         model = params.delete(model.inheritance_column).camelize.constantize if params[model.inheritance_column]
       end
-      model.respond_to?(:build) ? model.build(build_options || {}) : model.new
+      model.new(build_options || {})
     end
 
     private

data/lib/active_scaffold/actions/create.rb

@@ -42,7 +42,7 @@ module ActiveScaffold::Actions
       else
         if successful?
           flash[:info] = as_(:created_model, :model => @record.to_label)
-          if active_scaffold_config.create.edit_after_create
+          if active_scaffold_config.create.action_after_create
             redirect_to params_for(:action => "edit", :id => @record.id)
           elsif active_scaffold_config.create.persistent
             redirect_to params_for(:action => "new")

data/lib/active_scaffold/actions/list.rb~

@@ -17,8 +17,6 @@ module ActiveScaffold::Actions
 
     def list
       do_list
-      do_new if active_scaffold_config.list.always_show_create
-      @record ||= new_model if active_scaffold_config.list.always_show_search
       @nested_auto_open = active_scaffold_config.list.nested_auto_open
       respond_to_action(:list)
     end
@@ -175,7 +173,9 @@ module ActiveScaffold::Actions
     end
     alias_method :index_formats, :list_formats
 
-    alias_method :row_formats, :list_formats
+    def row_formats
+      ([:html] + active_scaffold_config.formats + active_scaffold_config.list.formats).uniq
+    end
 
     def action_update_formats
       (default_formats + active_scaffold_config.formats).uniq

data/lib/active_scaffold/actions/update.rb~

@@ -82,7 +82,6 @@ module ActiveScaffold::Actions
           @record = update_record_from_params(@record, active_scaffold_config.update.columns, params[:record]) unless options[:no_record_param_update]
           before_update_save(@record)
           self.successful = [@record.valid?, @record.associated_valid?].all? {|v| v == true} # this syntax avoids a short-circuit
-          debugger
           if successful?
             @record.save! and @record.save_associated!
             after_update_save(@record)

data/lib/active_scaffold/attribute_params.rb~

@@ -85,6 +85,8 @@ module ActiveScaffold
       record = find_or_create_for_params(attributes, column, parent_record)
       if record
         record_columns = active_scaffold_config_for(column.association.klass).subform.columns
+        record_columns.constraint_columns = [column.association.reverse]
+        debugger
         update_record_from_params(record, record_columns, attributes)
         record.unsaved = true
       end
@@ -101,7 +103,6 @@ module ActiveScaffold
     end
 
     def column_value_from_param_simple_value(parent_record, column, value)
-      debugger if column.name == :working_days
       if column.singular_association?
         # it's a single id
         column.association.klass.find(value) if value and not value.empty?

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

@@ -16,6 +16,8 @@ class ActiveScaffold::Bridges::RecordSelect
           active_scaffold_record_select(column, options, @record.send(column.name), multiple)
         elsif column.plural_association?
           active_scaffold_record_select(column, options, @record.send(column.name), true)
+        else
+          active_scaffold_record_select_autocomplete(column, options)
         end
       end
 
@@ -34,7 +36,7 @@ class ActiveScaffold::Bridges::RecordSelect
         record_select_options = active_scaffold_input_text_options(
           :controller => remote_controller,
           :id => options[:id],
-          :class => options[:class]
+          :class => options[:class].gsub(/update_form/, '')
         )
         record_select_options.merge!(column.options)
         if options['data-update_url']
@@ -51,6 +53,23 @@ class ActiveScaffold::Bridges::RecordSelect
         html = self.class.field_error_proc.call(html, self) if @record.errors[column.name].any?
         html
       end
+      
+      def active_scaffold_record_select_autocomplete(column, options)
+        record_select_options = active_scaffold_input_text_options(
+          :controller => active_scaffold_controller_for(@record.class).controller_path,
+          :id => options[:id],
+          :class => options[:class].gsub(/update_form/, '')
+        )
+        if options['data-update_url']
+          record_select_options[:onchange] = %|function(id, label) {
+              ActiveScaffold.update_column(null, "#{options['data-update_url']}", #{options['data-update_send_form'].to_json}, "#{options[:id]}", id);
+            }|
+        end
+
+        html = record_select_autocomplete(options[:name], value, record_select_options)
+        html = self.class.field_error_proc.call(html, self) if @record.errors[column.name].any?
+        html
+      end
     end
 
     module SearchColumnHelpers

data/lib/active_scaffold/config/base.rb~

@@ -0,0 +1,70 @@
+module ActiveScaffold::Config
+  class Base
+    include ActiveScaffold::Configurable
+    extend ActiveScaffold::Configurable
+
+    def initialize(core_config)
+      @core = core_config
+    end
+
+    def self.inherited(subclass)
+      class << subclass
+        # the crud type of the action. possible values are :create, :read, :update, :delete, and nil.
+        # this is not a setting for the developer. it's self-description for the actions.
+        def crud_type; @crud_type; end
+
+        protected
+
+        def crud_type=(val)
+          raise ArgumentError, "unknown CRUD type #{val}" unless [:create, :read, :update, :delete].include?(val.to_sym)
+          @crud_type = val.to_sym
+        end
+      end
+    end
+
+    # delegate
+    def crud_type; self.class.crud_type end
+
+    def label(model = @core.label(:count => 1))
+      @label.nil? ? model : as_(@label, :model => model)
+    end
+    
+    # the user property gets set to the instantiation of the local UserSettings class during the automatic instantiation of this class.
+    attr_accessor :user
+
+    # define a default action_group for this action
+    # e.g. 'members.crud'
+    class_attribute :action_group
+
+    # action_group this action should belong to
+    attr_accessor :action_group
+
+    class UserSettings
+      def initialize(conf, storage, params)
+        # the session hash relevant to this action
+        @session = storage
+        # all the request params
+        @params = params
+        # the configuration object for this action
+        @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
+      @columns.set_columns(@core.columns) if @columns.respond_to?(:set_columns)
+      @columns
+    end
+  end
+end

data/lib/active_scaffold/extensions/action_controller_rendering.rb~

@@ -8,7 +8,7 @@ module ActionController #:nodoc:
         opts = args.blank? ? Hash.new : args.first
         render :partial => params[:adapter][1..-1],
         :locals => {:payload => render_to_string(opts.merge(:layout => false), &block).html_safe},
-               :use_full_path => true, :layout => false
+               :use_full_path => true, :layout => false, :content_type => :html
         @rendering_adapter = nil # recursion control
       else
         render_without_active_scaffold(*args, &block)

data/lib/active_scaffold/extensions/action_view_rendering.rb~

@@ -1,5 +1,6 @@
 module ActionView
   class LookupContext
+    attr_accessor :uses_active_scaffold
     module ViewPaths
       def find_all_templates(name, partial = false, locals = {})
         prefixes.collect do |prefix|
@@ -11,6 +12,17 @@ module ActionView
         end.flatten!
       end
     end
+    
+    # Overload formats= to expand ["*/*"] values and automatically
+    # add :html as fallback to :js.
+    def formats=(values)
+      debugger
+      if values == [:js] && uses_active_scaffold
+        _set_detail(:formats, values) if values != @details[:formats]
+      else
+        super(values)
+      end
+    end
   end
 end
 
@@ -49,7 +61,7 @@ module ActionView::Helpers #:nodoc:
           last_view[:templates] = lookup_context.find_all_templates(last_view[:view], last_view[:partial], options[:locals].keys)
           last_view[:templates].shift
         end
-        options[:file] = last_view[:templates].shift
+        options[:template] = last_view[:templates].shift
         view_stack << last_view
         result = render_without_active_scaffold options
         view_stack.pop

data/lib/active_scaffold/finder.rb

@@ -95,7 +95,7 @@ module ActiveScaffold
         elsif value[:from].blank?
           nil
         elsif ActiveScaffold::Finder::StringComparators.values.include?(value[:opt])
-          ["#{column.search_sql} LIKE ?", value[:opt].sub('?', value[:from])]
+          ["#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?", value[:opt].sub('?', value[:from])]
         elsif value[:opt] == 'BETWEEN'
           ["#{column.search_sql} BETWEEN ? AND ?", value[:from], value[:to]]
         elsif ActiveScaffold::Finder::NumericComparators.include?(value[:opt])

data/lib/active_scaffold/helpers/form_column_helpers.rb~

@@ -121,8 +121,7 @@ module ActiveScaffold
       end
       
       def active_scaffold_checkbox_list(column, select_options, associated_ids, options)
-        options[:class] << " checkbox-list"
-        html = content_tag :ul, :class => options[:class], :id => options[:id] do
+        html = content_tag :ul, :class => "#{options[:class]} checkbox-list", :id => options[:id] do
           content = "".html_safe
           select_options.each_with_index do |option, i|
             label, id = option

data/lib/active_scaffold/helpers/list_column_helpers.rb~

@@ -84,7 +84,7 @@ module ActiveScaffold
           link.action = 'index'
           link.crud_type = :read
         end
-        link if link.crud_type.present?
+        link if link.action.present?
       end
 
       def column_link_authorized?(link, column, record, associated)
@@ -119,7 +119,7 @@ module ActiveScaffold
       ## Overrides
       ##
       def active_scaffold_column_text(column, record)
-        truncate(clean_column_value(record.send(column.name)), :length => column.options[:truncate] || 50)
+        clean_column_value(truncate(record.send(column.name), :length => column.options[:truncate] || 50))
       end
 
       def active_scaffold_column_checkbox(column, record)
@@ -190,25 +190,25 @@ module ActiveScaffold
       end
 
       def format_association_value(value, column, size)
-        case column.association.macro
+        format_value case column.association.macro
           when :has_one, :belongs_to
             if column.polymorphic_association?
-              format_value("#{value.class.model_name.human}: #{value.to_label}")
+              "#{value.class.model_name.human}: #{value.to_label}"
             else
-              format_value(value.to_label)
+              value.to_label
             end
           when :has_many, :has_and_belongs_to_many
             if column.associated_limit.nil?
-              firsts = value.collect { |v| clean_column_value(v.to_label) }
+              firsts = value.collect { |v| v.to_label }
             else
               firsts = value.first(column.associated_limit)
-              firsts.collect! { |v| clean_column_value(v.to_label) }
+              firsts.collect! { |v| v.to_label }
               firsts[column.associated_limit] = '…' if value.size > column.associated_limit
             end
             if column.associated_limit == 0
               size if column.associated_number?
             else
-              joined_associated = format_value(firsts.join(active_scaffold_config.list.association_join_text))
+              joined_associated = firsts.join(active_scaffold_config.list.association_join_text)
               joined_associated << " (#{size})" if column.associated_number? and column.associated_limit and value.size > column.associated_limit
               joined_associated
             end
@@ -275,11 +275,13 @@ module ActiveScaffold
 
       def inplace_edit_control(column)
         if inplace_edit?(active_scaffold_config.model, column) and inplace_edit_cloning?(column)
-          @record = new_model
+          old_record, @record = @record, new_model
           column = column.clone
           column.options = column.options.clone
           column.form_ui = :select if (column.association && column.form_ui.nil?)
-          content_tag(:div, active_scaffold_input_for(column), {:style => "display:none;", :class => inplace_edit_control_css_class})
+          content_tag(:div, active_scaffold_input_for(column), :style => "display:none;", :class => inplace_edit_control_css_class).tap do
+            @record = old_record
+          end
         end
       end
 

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 3
   - 0
-  - 24
-  version: 3.0.24
+  - 25
+  version: 3.0.25
 platform: ruby
 authors: 
 - Many, see README
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-07 00:00:00 Z
+date: 2011-12-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -27,12 +27,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id001
+  prerelease: false
   type: :development
   name: shoulda
-  version_requirements: *id001
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -43,12 +43,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  requirement: *id002
+  prerelease: false
   type: :development
   name: bundler
-  version_requirements: *id002
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,12 +57,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id003
+  prerelease: false
   type: :development
   name: rcov
-  version_requirements: *id003
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -71,12 +71,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id004
+  prerelease: false
   type: :runtime
   name: render_component_vho
-  version_requirements: *id004
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -85,12 +85,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id005
+  prerelease: false
   type: :runtime
   name: verification
-  version_requirements: *id005
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -101,10 +101,10 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
+  requirement: *id006
+  prerelease: false
   type: :runtime
   name: rails
-  version_requirements: *id006
-  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: []
@@ -172,16 +172,16 @@ files:
 - frontends/default/views/add_existing_form.html.erb
 - frontends/default/views/create.html.erb
 - frontends/default/views/_human_conditions.html.erb
-- frontends/default/views/_render_field.js.rjs
+- frontends/default/views/_list_with_header.html.erb
 - frontends/default/views/field_search.html.erb
-- frontends/default/views/add_existing.js.rjs
+- frontends/default/views/_render_field.js.rjs
 - frontends/default/views/search.html.erb
-- frontends/default/views/destroy.js.rjs
+- frontends/default/views/add_existing.js.rjs
 - frontends/default/views/update.html.erb
 - frontends/default/views/_list_pagination.html.erb
 - frontends/default/views/_list_record_columns.html.erb
 - frontends/default/views/show.html.erb
-- frontends/default/views/_list_with_header.html.erb
+- frontends/default/views/destroy.js.rjs
 - frontends/default/views/_search_attribute.html.erb
 - frontends/default/views/action_confirmation.html.erb
 - frontends/default/views/edit_associated.js.rjs
@@ -197,13 +197,14 @@ files:
 - frontends/default/views/_form.html.erb~
 - frontends/default/views/_row.html.erb~
 - frontends/default/views/render_field.js.erb~
-- frontends/default/views/_horizontal_subform_record.html.erb~
+- frontends/default/views/update_column.js.erb~
 - frontends/default/views/_form_association_footer.html.erb~
 - frontends/default/views/edit_associated.js.erb~
 - frontends/default/views/_list_inline_adapter.html.erb~
 - frontends/default/views/_form_association.html.erb~
 - frontends/default/views/_vertical_subform.html.erb~
 - frontends/default/views/_horizontal_subform.html.erb~
+- frontends/default/views/_show.html.erb~
 - frontends/default/views/_horizontal_subform_header.html.erb~
 - frontends/default/views/_list_pagination.html.erb~
 - frontends/default/views/_list_actions.html.erb~
@@ -211,6 +212,11 @@ files:
 - frontends/default/views/_list_messages.html.erb~
 - frontends/default/views/_render_field.js.erb~
 - frontends/default/views/_action_group.html.erb~
+- frontends/default/views/on_update.js.erb~
+- frontends/default/views/on_create.js.erb~
+- frontends/default/views/_horizontal_subform_record.html.erb~
+- frontends/default/views/_list_with_header.html.erb~
+- frontends/default/views/_update_form.html.erb~
 - lib/active_scaffold.rb
 - lib/active_scaffold_env.rb
 - lib/active_scaffold/actions/core.rb
@@ -248,6 +254,7 @@ files:
 - lib/active_scaffold/config/mark.rb
 - lib/active_scaffold/config/search.rb~
 - lib/active_scaffold/config/nested.rb~
+- lib/active_scaffold/config/base.rb~
 - lib/active_scaffold/configurable.rb
 - lib/active_scaffold/constraints.rb
 - lib/active_scaffold/data_structures/action_columns.rb