active_scaffold 3.0.5 → 3.0.11

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

@@ -1,4 +1,4 @@
-<div id="<%= active_scaffold_id -%>" class="active-scaffold active-scaffold-<%= controller_id %> <%= "#{params[:controller]}-view" %> <%= active_scaffold_config.theme %>-theme">
+<div id="<%= active_scaffold_id -%>" class="active-scaffold active-scaffold-<%= controller_id %> <%= "#{params[:controller]}-view" %> <%= active_scaffold_config.theme %>-theme" <%= "data-eid=#{id_from_controller(params[:eid])}" if params[:eid]%>>
   <div class="active-scaffold-header">
     <%= render :partial => 'list_header' %>
   </div>
@@ -26,7 +26,7 @@
       <% end %>
     </tbody>
   </table>
-  <div id="<%= active_scaffold_content_id -%>">
+  <div id="<%= active_scaffold_content_id-%>" class="as_content">
     <%= render :partial => 'list' %>
   </div>
 </div>

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

@@ -1,10 +1,10 @@
 <% for name in [:info, :warning, :error] %>
   <% if flash[name] %>
-    <p class="<%= "#{name}-message message" %>" >
+    <div class="<%= "#{name}-message message" %>">
       <%= h flash[name] %>
       <% if request.xhr? %>
         <a href="#" onclick="ActiveScaffold.remove(this.parentNode); return false;" title="<%= as_(:close) %>"><%= as_(:close) %></a>
       <% end %>
-    </p>
+    </div>
   <% end %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <% live_search = active_scaffold_config.search.live? -%>
 <% url_options =  params_for(:action => :index, :escape => false).delete_if{|k,v| k == 'search'} -%>
 <%=
-options = {:id => search_form_id,
+options = {:id => element_form_id(:action => 'search'),
            :class => "as_form search",
            :remote => true,
            :method => :get}
@@ -29,6 +29,6 @@ options['data-loading'] = true unless live_search
   $(<%= "##{search_input_id}".to_json.html_safe %>).delayedObserver(0.5, function() {
      $(<%= "##{search_input_id}".to_json.html_safe %>).parent().trigger("submit");});
 <% end -%>
-ActiveScaffold.focus_first_element_of_form('<%= search_form_id %>');
+ActiveScaffold.focus_first_element_of_form('<%= element_form_id(:action => 'search') %>');
 //]]>
 </script>

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

@@ -3,6 +3,6 @@
 <%= 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 => true, 'data-refresh' => false %>
+  <%= 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

@@ -1,5 +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 ||= true,
+                                                :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/_vertical_subform.html.erb

@@ -3,7 +3,7 @@
   <% @record = associated[index] -%>
   <% if @record.errors.count -%>
   <div class="association-record-errors" id="<%= element_messages_id :action => @record.class.name.underscore, :id => "#{parent_record.id}-#{index}" %>">
-    <%= error_messages_for :record, :object_name => @record.class.model_name.human.downcase %>
+    <%= active_scaffold_error_messages_for :record, :object_name => @record.class.model_name.human.downcase %>
   </div>
   <% end %>
   <%= render :partial => 'vertical_subform_record', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column, :locked => @record.new_record? && @record == associated.last} %>

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

@@ -0,0 +1,13 @@
+<div class="active-scaffold">
+  <div class="delete-view view">
+    <%= form_tag params_for(:action => link.action, :id => params[:id]), { :method => link.method } %>
+      <h4><%= link.confirm(record.try(:to_label)) -%></h4>
+
+      <p class="form-footer">
+        <%= submit_tag as_(link.label), :class => 'submit' %>
+        <%= link_to as_(:cancel), main_path_to_return, :class => 'cancel' %>
+      </p>
+
+    </form>
+  </div>
+</div>

data/frontends/default/views/add_existing.js.rjs

@@ -1,5 +1,5 @@
 new_row = render :partial => 'list_record', :locals => {:record => @record}
-page << "ActiveScaffold.create_record_row('#{active_scaffold_tbody_id}','#{escape_javascript(new_row)}', #{{:insert_at => :top}.to_json});"
+page << "ActiveScaffold.create_record_row('#{active_scaffold_id}','#{escape_javascript(new_row)}', #{{:insert_at => :top}.to_json});"
 page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}
 
 if (form_stays_open = true)

data/frontends/default/views/destroy.js.rjs

@@ -1,5 +1,23 @@
+messages_id = active_scaffold_messages_id
 if controller.send(:successful?)
-  page << "ActiveScaffold.delete_record_row('#{element_row_id(:action => 'list', :id => params[:id])}','#{url_for(params_for(:action => :index, :id => nil, :page => [active_scaffold_config.list.user.page.to_i - 1, 1].max, :escape => false))}');"
-  page.call 'ActiveScaffold.replace',  active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}
+  if render_parent? && controller.respond_to?(:render_component_into_view)
+    render_parent_options
+    if render_parent_action == :row
+      # TODO: That s not working with delete....
+      page << "ActiveScaffold.delete_record_row('#{element_row_id(:controller_id => "as_#{id_from_controller(params[:eid] || params[:parent_sti])}", :action => 'list', :id => params[:id])}','#{url_for(params_for(:action => :index, :id => nil, :page => [active_scaffold_config.list.user.page.to_i - 1, 1].max, :escape => false))}');"
+      messages_id = active_scaffold_messages_id(:controller_id => "as_#{id_from_controller(params[:eid] || params[:parent_sti])}")
+    elsif render_parent_action == :index
+      parent_rendered = controller.send(:render_component_into_view, render_parent_options)
+      page << parent_rendered
+    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.delete.refresh_list)
+    page.call 'ActiveScaffold.replace_html', active_scaffold_content_id, render(:partial => 'list', :layout => false)
+  else
+    page << "ActiveScaffold.delete_record_row('#{element_row_id(:action => 'list', :id => params[:id])}','#{url_for(params_for(:action => :index, :id => nil, :page => [active_scaffold_config.list.user.page.to_i - 1, 1].max, :escape => false))}');"
+    page.call 'ActiveScaffold.replace',  active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}
+  end
+else
+  flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br)
 end
-page.call 'ActiveScaffold.replace_html', active_scaffold_messages_id, render(:partial => 'messages')
+page.call 'ActiveScaffold.replace_html', messages_id, render(:partial => 'messages')

data/frontends/default/views/on_action_update.js.rjs

@@ -1,6 +1,6 @@
 page.call 'ActiveScaffold.replace_html', active_scaffold_messages_id, render(:partial => 'messages')
 if controller.send :successful?
-  page.call 'ActiveScaffold.replace', element_row_id(:action => :list, :id => @record.id), render(:partial => 'list_record', :locals => {:record => @record}) if @record 
+  page.call 'ActiveScaffold.update_row', element_row_id(:action => :list, :id => @record.id), render(:partial => 'list_record', :locals => {:record => @record}) if @record
   page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}
 else
   page.call 'ActiveScaffold.scroll_to', active_scaffold_messages_id

data/frontends/default/views/on_create.js.rjs

@@ -1,22 +1,39 @@
 form_selector = "#{element_form_id(:action => :create)}"
-
-page << "ActiveScaffold.find_action_link('#{form_selector}').update_flash_messages('#{escape_javascript(render(:partial => 'messages').strip)}');"
+insert_at ||= :top
+page << "var action_link = ActiveScaffold.find_action_link('#{form_selector}');"
+page << "action_link.update_flash_messages('#{escape_javascript(render(:partial => 'messages').strip)}');"
 if controller.send :successful?
-  if @insert_row
+  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?
+      page << "action_link.close('#{escape_javascript(parent_rendered)}');"
+    else
+      if render_parent_action == :row
+        page << "ActiveScaffold.create_record_row(action_link.scaffold(),'#{escape_javascript(parent_rendered)}', #{{:insert_at => insert_at}.to_json});"
+      elsif render_parent_action == :index
+        page << parent_rendered
+      end
+      page << "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)
+    page.call 'ActiveScaffold.replace_html', active_scaffold_content_id, render(:partial => 'list', :layout => false)
+  elsif params[:parent_controller].nil?
     new_row = render :partial => 'list_record', :locals => {:record => @record}
-    insert_at ||= :top
-    page << "ActiveScaffold.create_record_row('#{active_scaffold_tbody_id}','#{escape_javascript(new_row)}', #{{:insert_at => insert_at}.to_json});"
+    page << "ActiveScaffold.create_record_row(action_link.scaffold(),'#{escape_javascript(new_row)}', #{{:insert_at => insert_at}.to_json});"
     page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}
   end
 
-  if (active_scaffold_config.create.persistent)
-    page << "ActiveScaffold.find_action_link('#{form_selector}').reload();"
-  else
-    page << "ActiveScaffold.find_action_link('#{form_selector}').close();"
-  end
-  if (active_scaffold_config.create.edit_after_create)
-    page << "var link = $('#{action_link_id 'edit', @record.id}');"
-    page << "if (link) (function() { link.action_link.open() }).defer();"
+  unless render_parent?
+    if (active_scaffold_config.create.persistent)
+      page << "action_link.reload();"
+    else
+      page << "action_link.close();"
+    end
+    if (active_scaffold_config.create.edit_after_create)
+      page << "var link = $('#{action_link_id 'edit', @record.id}');"
+      page << "if (link) (function() { link.action_link.open() }).defer();"
+    end
   end
 else
   page.call 'ActiveScaffold.replace', form_selector, render(:partial => 'create_form', :locals => {:xhr => true})

data/frontends/default/views/on_update.js.rjs

@@ -1,14 +1,27 @@
 form_selector = "#{element_form_id(:action => :update)}"
 
-page << "ActiveScaffold.find_action_link('#{form_selector}').update_flash_messages('#{escape_javascript(render(:partial => 'messages').strip)}');"
+page << "var action_link = ActiveScaffold.find_action_link('#{form_selector}');"
+page << "action_link.update_flash_messages('#{escape_javascript(render(:partial => 'messages').strip)}');"
 if controller.send :successful?
-  updated_row = if nested? && nested.belongs_to?
-    nil
+  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?
+      page << "action_link.close('#{escape_javascript(parent_rendered)}');"
+    else
+      if render_parent_action == :row
+        page << "action_link.close('#{escape_javascript(parent_rendered)}');"
+      elsif render_parent_action == :index
+        page << 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 (active_scaffold_config.update.refresh_list)
+    page.call 'ActiveScaffold.replace_html', active_scaffold_content_id, render(:partial => 'list', :layout => false)
   else
-    render :partial => 'list_record', :locals => {:record => @record}
+    updated_row = render :partial => 'list_record', :locals => {:record => @record}
+    page << "action_link.close('#{escape_javascript(updated_row)}');"
+    page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}
   end
-  page << "ActiveScaffold.find_action_link('#{form_selector}').close('#{escape_javascript(updated_row)}');"
-  page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}
 else
   page.call 'ActiveScaffold.replace', form_selector, render(:partial => 'update_form', :locals => {:xhr => true})
   page.call 'ActiveScaffold.scroll_to', form_selector

data/init.rb

@@ -1 +1,7 @@
 require 'active_scaffold'
+
+begin
+  ActiveScaffoldAssets.copy_to_public(ActiveScaffold.root, {:clean_up_destination => true})
+rescue
+  raise $! unless Rails.env == 'production'
+end

data/lib/active_scaffold/actions/core.rb

@@ -8,19 +8,10 @@ module ActiveScaffold::Actions
       base.helper_method :beginning_of_chain
     end
     def render_field
-      @record ||= if params[:in_place_editing]
-        active_scaffold_config.model.find params[:id]
-      else
-        active_scaffold_config.model.new
-      end
-      column = active_scaffold_config.columns[params[:column]]
       if params[:in_place_editing]
-        render :inline => "<%= active_scaffold_input_for(active_scaffold_config.columns[params[:update_column].to_sym]) %>"
-      elsif !column.nil?
-        value = column_value_from_param_value(@record, column, params[:value])
-        @record.send "#{column.name}=", value
-        after_render_field(@record, column)
-        render :partial => "render_field", :collection => Array(params[:update_columns]), :content_type => 'text/javascript'
+        render_field_for_inplace_editing
+      else
+        render_field_for_update_columns
       end
     end
 
@@ -30,6 +21,23 @@ module ActiveScaffold::Actions
       false
     end
 
+    def render_field_for_inplace_editing
+      register_constraints_with_action_columns(nested.constrained_fields, active_scaffold_config.update.hide_nested_column ? [] : [:update]) if nested?
+      @record = find_if_allowed(params[:id], :update)
+      render :inline => "<%= active_scaffold_input_for(active_scaffold_config.columns[params[:update_column].to_sym]) %>"
+    end
+
+    def render_field_for_update_columns
+      @record = new_model
+      column = active_scaffold_config.columns[params[:column]]
+      unless column.nil?
+        value = column_value_from_param_value(@record, column, params[:value])
+        @record.send "#{column.name}=", value
+        after_render_field(@record, column)
+        render :partial => "render_field", :collection => Array(params[:update_columns]), :content_type => 'text/javascript'
+      end
+    end
+    
     # override this method if you want to do something after render_field
     def after_render_field(record, column); end
 
@@ -127,6 +135,18 @@ module ActiveScaffold::Actions
       end
       conditions
     end
+
+    def new_model
+      model = beginning_of_chain
+      if model.columns_hash[model.inheritance_column]
+        build_options = {model.inheritance_column.to_sym => active_scaffold_config.model_id} if nested? && nested.association && nested.association.collection?
+        params = self.params # in new action inheritance_column must be in params
+        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
+    end
+
     private
     def respond_to_action(action)
       respond_to do |type|

data/lib/active_scaffold/actions/create.rb

@@ -14,7 +14,6 @@ module ActiveScaffold::Actions
 
     def create
       do_create
-      @insert_row = !(nested? && nested.belongs_to?) && params[:parent_controller].nil?
       respond_to_action(:create)
     end
 
@@ -62,6 +61,10 @@ module ActiveScaffold::Actions
     end
 
     def create_respond_to_js
+      if successful? && active_scaffold_config.create.refresh_list && !render_parent?
+        do_search if respond_to? :do_search
+        do_list
+      end
       render :action => 'on_create'
     end
 
@@ -111,16 +114,6 @@ module ActiveScaffold::Actions
       end
     end
 
-    def new_model
-      model = beginning_of_chain
-      if model.columns_hash[model.inheritance_column]
-        params = self.params # in new action inheritance_column must be in params
-        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.new
-    end
-
     # override this method if you want to inject data in the record (or its associated objects) before the save
     def before_create_save(record); end
 

data/lib/active_scaffold/actions/delete.rb

@@ -1,29 +1,32 @@
 module ActiveScaffold::Actions
   module Delete
     def self.included(base)
-      base.before_filter :delete_authorized_filter, :only => [:delete, :destroy]
-    end
-
-    # this method is for html mode. it provides "the missing action" (http://thelucid.com/articles/2006/07/26/simply-restful-the-missing-action).
-    # it also gives us delete confirmation for html mode. woo!
-    def delete
-      destroy_find_record
-      render :action => 'delete'
+      base.before_filter :delete_authorized_filter, :only => [:destroy]
     end
 
     def destroy
-      return redirect_to(params.merge(:action => :delete)) if request.get?
-      do_destroy
-      respond_to_action(:destroy)
+      params.delete :destroy_action
+      process_action_link_action(:destroy) do |record|
+        do_destroy
+      end
     end
 
     protected
     def destroy_respond_to_html
-      flash[:info] = as_(:deleted_model, :model => @record.to_label) if self.successful?
+      if self.successful?
+        flash[:info] = as_(:deleted_model, :model => @record.to_label)
+      else
+        #error_message_for not available in controller...
+        #flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br)
+      end
       return_to_main
     end
 
     def destroy_respond_to_js
+      if successful? && active_scaffold_config.delete.refresh_list && !render_parent?
+        do_search if respond_to? :do_search
+        do_list
+      end
       render(:action => 'destroy')
     end
 
@@ -46,7 +49,7 @@ module ActiveScaffold::Actions
     # A simple method to handle the actual destroying of a record
     # May be overridden to customize the behavior
     def do_destroy
-      destroy_find_record
+      @record ||= destroy_find_record
       begin
         self.successful = @record.destroy
       rescue

data/lib/active_scaffold/actions/list.rb

@@ -11,7 +11,8 @@ module ActiveScaffold::Actions
 
     # get just a single row
     def row
-      render :partial => 'row', :locals => {:record => find_if_allowed(params[:id], :read)}
+      @record = find_if_allowed(params[:id], :read)
+      respond_to_action(:row)
     end
 
     def list
@@ -49,6 +50,15 @@ 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(:partial => 'row', :locals => {:record => @record})
+    end
+
     # The actual algorithm to prepare for the list view
     def do_list
       includes_for_list_columns = active_scaffold_config.list.columns.collect{ |c| c.includes }.flatten.uniq.compact
@@ -75,7 +85,7 @@ module ActiveScaffold::Actions
 
     def each_record_in_scope
       do_search if respond_to? :do_search
-      finder_options = { :order => "#{active_scaffold_config.model.primary_key} ASC",
+      finder_options = { :order => "#{active_scaffold_config.model.connection.quote_table_name(active_scaffold_config.model.table_name)}.#{active_scaffold_config.model.primary_key} ASC",
                          :conditions => all_conditions,
                          :joins => joins_for_finder}
       finder_options.merge! custom_finder_options
@@ -90,6 +100,45 @@ module ActiveScaffold::Actions
       authorized_for?(:crud_type => :read)
     end
 
+    # call this method in your action_link action to simplify processing of actions
+    # eg for member action_link :fire
+    # process_action_link_action do |record|
+    #   record.update_attributes(:fired => true)
+    #   self.successful = true
+    #   flash[:info] = 'Player fired'
+    # end
+    def process_action_link_action(render_action = :action_update)
+      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
+        respond_to_action(:action_confirmation)
+      else
+        if params[:id] && params[:id] && params[:id].to_i > 0
+          @record = find_if_allowed(params[:id], (request.post? || request.put?) ? :update : :delete)
+          unless @record.nil?
+            yield @record
+          else
+            self.successful = false
+            flash[:error] = as_(:no_authorization_for_action, :action => action_name)
+          end
+        else
+          yield
+        end
+        respond_to_action(render_action)
+      end
+    end
+
+    def action_confirmation_respond_to_html(confirm_action = action_name.to_sym)
+      link = active_scaffold_config.action_links[confirm_action]
+      render :action => 'action_confirmation', :locals => {:record => @record, :link => link}
+    end
+
+    def action_update_respond_to_html
+      do_search if respond_to? :do_search
+      do_list
+      redirect_to :action => 'index'
+    end
+
     def action_update_respond_to_js
       render(:action => 'on_action_update')
     end
@@ -110,13 +159,20 @@ module ActiveScaffold::Actions
     def list_authorized_filter
       raise ActiveScaffold::ActionNotAllowed unless list_authorized?
     end
+
     def list_formats
       (default_formats + active_scaffold_config.formats + active_scaffold_config.list.formats).uniq
     end
+    alias_method :row_formats, :list_formats
+
     def action_update_formats
       (default_formats + active_scaffold_config.formats).uniq
     end
 
+    def action_confirmation_formats
+      (default_formats + active_scaffold_config.formats).uniq
+    end
+
     def list_columns
       active_scaffold_config.list.columns.collect_visible
     end

data/lib/active_scaffold/actions/mark.rb

@@ -22,7 +22,7 @@ module ActiveScaffold::Actions
     # because the object may change. So we give ActiveRecord a proc that ties to the
     # marked_records_method on this ApplicationController.
     def assign_marked_records_to_model
-      active_scaffold_config.model.marked_records_proc = proc {send(:marked_records)}
+      active_scaffold_config.model.marked_records = marked_records
     end
 
     def marked_records

data/lib/active_scaffold/actions/nested.rb

@@ -16,6 +16,7 @@ module ActiveScaffold::Actions
       end
       base.before_filter :include_habtm_actions
       base.helper_method :nested
+      base.helper_method :nested_parent_record
     end
 
     protected
@@ -23,7 +24,7 @@ module ActiveScaffold::Actions
       @nested ||= ActiveScaffold::DataStructures::NestedInfo.get(active_scaffold_config.model, active_scaffold_session_storage)
       if !@nested.nil? && @nested.new_instance?
         register_constraints_with_action_columns(@nested.constrained_fields)
-        active_scaffold_constraints[:id] = nested.parent_id if @nested.belongs_to?
+        active_scaffold_constraints[:id] = params[:id] if @nested.belongs_to?
       end
       @nested
     end
@@ -33,12 +34,12 @@ module ActiveScaffold::Actions
     end
 
     def set_nested
-      if params[:parent_model] && ((params[:association] && params[:assoc_id]) || params[:named_scope])
+      if params[:parent_scaffold] && ((params[:association] && params[:assoc_id]) || params[:named_scope])
         @nested = nil
-        active_scaffold_session_storage[:nested] = {:parent_model => params[:parent_model].camelize.constantize,
+        active_scaffold_session_storage[:nested] = {:parent_scaffold => params[:parent_scaffold].to_s,
                                                                   :name => (params[:association] || params[:named_scope]).to_sym,
                                                                   :parent_id => params[:assoc_id]}
-        params.delete_if {|key, value| [:parent_model, :association, :named_scope, :assoc_id].include? key.to_sym}
+        params.delete_if {|key, value| [:parent_scaffold, :association, :named_scope, :assoc_id].include? key.to_sym}
       end
     end
 
@@ -66,7 +67,9 @@ module ActiveScaffold::Actions
           active_scaffold_config.action_links.add('new_existing', :label => :add_existing, :type => :collection, :security_method => :add_existing_authorized?) unless active_scaffold_config.action_links['new_existing']
           if active_scaffold_config.nested.shallow_delete
             active_scaffold_config.action_links.add('destroy_existing', :label => :remove, :type => :member, :confirm => :are_you_sure_to_delete, :method => :delete, :position => false, :security_method => :delete_existing_authorized?) unless active_scaffold_config.action_links['destroy_existing']
-            active_scaffold_config.action_links.delete("delete") if active_scaffold_config.action_links['delete']
+            if active_scaffold_config.actions.include?(:delete)
+              active_scaffold_config.action_links.delete("delete") if active_scaffold_config.action_links['delete']
+            end
           end
         else
           # Production mode is caching this link into a non nested scaffold
@@ -74,7 +77,9 @@ module ActiveScaffold::Actions
 
           if active_scaffold_config.nested.shallow_delete
             active_scaffold_config.action_links.delete("destroy_existing") if active_scaffold_config.action_links['destroy_existing']
-            active_scaffold_config.action_links.add(ActiveScaffold::Config::Delete.link) unless active_scaffold_config.action_links['delete']
+            if active_scaffold_config.actions.include?(:delete)
+              active_scaffold_config.action_links.add(ActiveScaffold::Config::Delete.link) unless active_scaffold_config.action_links['delete']
+            end
           end
         end
       end
@@ -91,18 +96,22 @@ module ActiveScaffold::Actions
     end
 
     def nested_parent_record(crud = :read)
-      find_if_allowed(nested.parent_id, crud, nested.parent_model)
+      @nested_parent_record ||= find_if_allowed(nested.parent_id, crud, nested.parent_model)
     end
 
     def create_association_with_parent(record)
-      if nested? && nested.belongs_to? && nested.child_association
-        parent = nested_parent_record(:read)
-        case nested.child_association.macro
-        when :has_one
-          record.send("#{nested.child_association.name}=", parent)
-        when :has_many
-          record.send("#{nested.child_association.name}").send(:<<, parent)
-        end unless parent.nil?
+      if nested?
+        if (nested.belongs_to? || nested.has_one? || nested.habtm?) && nested.child_association
+          parent = nested_parent_record(:read)
+          case nested.child_association.macro
+          when :has_one
+            record.send("#{nested.child_association.name}=", parent)
+          when :belongs_to
+            record.send("#{nested.child_association.name}=", parent)
+          when :has_many, :has_and_belongs_to_many
+            record.send("#{nested.child_association.name}").send(:<<, parent)
+          end unless parent.nil?
+        end
       end
     end
 

data/lib/active_scaffold/actions/show.rb

@@ -5,9 +5,16 @@ module ActiveScaffold::Actions
     end
 
     def show
-      do_show
-      successful?
-      respond_to_action(:show)
+      # rest destroy falls back to rest show in case of disabled javascript
+      # just render action_confirmation message for destroy
+      unless params.delete :destroy_action
+        do_show
+        successful?
+        respond_to_action(:show)
+      else
+        @record = find_if_allowed(params[:id], :read) if params[:id] && params[:id] && params[:id].to_i > 0
+        action_confirmation_respond_to_html(:destroy)
+      end
     end
 
     protected

data/lib/active_scaffold/actions/update.rb

@@ -49,6 +49,10 @@ module ActiveScaffold::Actions
       end
     end
     def update_respond_to_js
+      if successful? && active_scaffold_config.update.refresh_list && !render_parent?
+        do_search if respond_to? :do_search
+        do_list
+      end
       render :action => 'on_update'
     end
     def update_respond_to_xml
@@ -87,10 +91,10 @@ module ActiveScaffold::Actions
         end
       rescue ActiveRecord::RecordInvalid
       rescue ActiveRecord::StaleObjectError
-        @record.errors.add_to_base as_(:version_inconsistency)
+        @record.errors.add(:base, as_(:version_inconsistency))
         self.successful=false
       rescue ActiveRecord::RecordNotSaved
-        @record.errors.add_to_base as_(:record_not_saved) if @record.errors.empty?
+        @record.errors.add(:base, as_(:record_not_saved)) if @record.errors.empty?
         self.successful = false
       end
     end
@@ -100,7 +104,10 @@ module ActiveScaffold::Actions
       if @record.authorized_for?(:crud_type => :update, :column => params[:column])
         column = active_scaffold_config.columns[params[:column].to_sym]
         params[:value] ||= @record.column_for_attribute(params[:column]).default unless @record.column_for_attribute(params[:column]).nil? || @record.column_for_attribute(params[:column]).null
-        params[:value] = column_value_from_param_value(@record, column, params[:value]) unless column.nil?
+        unless column.nil?
+          params[:value] = column_value_from_param_value(@record, column, params[:value])
+          params[:value] = [] if params[:value].nil? && column.form_ui && column.plural_association?
+        end
         @record.send("#{params[:column]}=", params[:value])
         before_update_save(@record)
         @record.save