active_scaffold_vho 3.0.31 → 3.1.0

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

@@ -1,8 +1,11 @@
 <% if active_scaffold_config.list.pagination -%>
 <div class="active-scaffold-footer">
-<% unless active_scaffold_config.list.pagination == :infinite -%>
-  <div class="active-scaffold-found"><span class="active-scaffold-records"><%= @records.total_count -%></span> <%=as_(:found, :count => @records.total_count) %></div>
+<% unless @page.pager.infinite? -%>
+  <div class="active-scaffold-found"><span class="active-scaffold-records"><%= @page.pager.count -%></span> <%=as_(:found, :count => @page.pager.count) %></div>
 <% end -%>
-  <%= paginate @records, :window => active_scaffold_config.list.page_links_window, :params => params_for(:action => :index), :remote => true %>
+  <div class="active-scaffold-pagination">
+    <%= render :partial => 'list_pagination_links', :locals => { :current_page => @page } if @page.pager.infinite? || @page.pager.number_of_pages > 1 %>
+  </div>
+  <br clear="both" /><%# a hack for the Rico Corner problem %>
 </div>
 <% end -%>

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

@@ -0,0 +1,9 @@
+<% unless current_page.nil? -%>
+  <% url_options = params_for(:action => :index) -%>
+  <% options = {'data-page-history' => controller_id, :remote => true, :method => :get} -%>
+
+  <%= loading_indicator_tag :action => :pagination %>
+  <%= link_to as_(:previous), url_options.merge(:page => current_page.number - 1), options.merge(:class => "as_paginate previous") if current_page.prev? %>
+  <%= pagination_ajax_links current_page, url_options, options, active_scaffold_config.list.page_links_window %>
+  <%= link_to as_(:next), url_options.merge(:page => current_page.number + 1), options.merge(:class => "as_paginate next") if current_page.next? %>
+<% end -%>

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

@@ -6,8 +6,9 @@ tr_class += " #{list_row_class(record)}" if respond_to? :list_row_class
 url_options = params_for(:action => :list, :id => record.id)
 action_links ||= active_scaffold_config.action_links.member
 -%>
+
 <tr class="record <%= tr_class %>" id="<%= element_row_id(:action => :list, :id => record.id) %>" data-refresh="<%= url_for(params_for(:action => :row, :id => record.id, :_method => :get, :escape => false)).html_safe %>" data-as_load="tr">
   <%= render :partial => 'list_record_columns', :locals => {:record => record, :columns => columns} %>
   <%= render :partial => 'list_actions', :locals => {:record => record, :url_options => url_options, :action_links => action_links} unless action_links.empty? %>
+  <%= render_nested_view(action_links, url_options, record) unless @nested_auto_open.nil? %>
 </tr>
-<%= render_nested_view(action_links, url_options, record) unless @nested_auto_open.nil? %>

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

@@ -1,6 +1,7 @@
 <% columns.each do |column| %>
-  <% authorized = record.authorized_for_read_column?(column.name) -%>
+  <% authorized = record.authorized_for?(:crud_type => :read, :column => column.name) -%>
   <% column_value = authorized ? get_column_value(record, column) : active_scaffold_config.list.empty_field_text -%>
+
   <td class="<%= column_class(column, column_value, record) %>" >
     <%= authorized ? render_list_column(column_value, column, record) : column_value %>
   </td>

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

@@ -1,4 +1,4 @@
-<div id="<%= active_scaffold_id -%>" class="<%= as_main_div_class %>" <%= "data-eid=#{id_from_controller(params[:eid])}" if params[:eid]%> data-closelabel="<%=as_(:close).html_safe%>" data-controller=<%="#{params[:controller]}"%>>
+<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>

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

@@ -5,7 +5,6 @@
       <% if request.xhr? %>
         <a href="#" onclick="ActiveScaffold.remove(this.parentNode); return false;" title="<%= as_(:close) %>"><%= as_(:close) %></a>
       <% end %>
-      <% flash[name] = nil %>
     </div>
   <% end %>
 <% end %>

data/frontends/default/views/_render_field.js.erb

@@ -0,0 +1,13 @@
+<%column = active_scaffold_config.columns[render_field.to_sym]
+  options = {:is_subform => false, :field_class => "#{column.name}-input"}
+  if column_renders_as(column) == :subform
+    options[:is_subform] = true
+  end %>
+
+ActiveScaffold.render_form_field('<%=source_id%>','<%=escape_javascript(render(:partial => form_partial_for_column(column), :locals => { :column => column, :scope => params[:scope] }))%>', <%=options.to_json.html_safe%>);
+<%if column.update_columns && !column.update_columns.empty?%>
+  <%=  render(:partial => "render_field", :collection => column.update_columns)%>
+<%end%>
+
+    
+

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

@@ -6,7 +6,6 @@
   config = active_scaffold_config_for(@record.class)
   options = active_scaffold_input_options(config.columns[@record.class.primary_key], scope)
   tr_id = "association-#{options[:id]}"
-  associated_action = @record.new_record? ? :create_or_empty : :update
 -%>
 <ol id="<%= tr_id %>" class="association-record <%= 'association-record-new' if @record.new_record? -%> <%= 'locked' if locked -%>">
 <% config.subform.columns.each :for => @record, :crud_type => crud_type, :flatten => true do |column| %>
@@ -27,16 +26,13 @@
 <% if show_actions -%>
   <li class="actions">
     <% if record_column.plural_association? and (@record.authorized_for?(:crud_type => :delete) or not [:destroy, :delete_all].include?(record_column.association.options[:dependent])) %>
-      <% link_classes = ['destroy', 'as_destroy_existing']
-         link_classes << 'as_associated_form_link' if !locked %>
-      <%= link_to as_(:remove), '#', :class => link_classes.join(' '), :style=> "display: none;" %>
+      <% destroy_id = "#{options[:id]}-destroy" %>
+      <%= link_to as_(:remove), '#', :class => 'destroy', :id => destroy_id , :onclick => "ActiveScaffold.delete_subform_record(\"#{tr_id}\"); return false;", :style=> "display: none;" %>
+      <%= javascript_tag("ActiveScaffold.show('#{destroy_id}');") if !locked %>
     <% end %> 
-  </li>
-<% end -%>
-  <li>
     <% unless @record.new_record? %>
-    <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= @record.id -%>" />
+      <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= @record.id -%>" />
     <% end -%>
-    <input type="hidden" name="<%= scope ? "record#{scope}[associated_action]" : "record[associated_action]" -%>" class="associated_action" value="<%= associated_action -%>" />
   </li>
+<% end -%>
 </ol>

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

@@ -0,0 +1,20 @@
+<% new_row = render :partial => 'list_record', :locals => {:record => @record}%>
+ActiveScaffold.create_record_row('<%=active_scaffold_id%>','<%=escape_javascript(new_row)%>', <%={:insert_at => :top}.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 %>
+
+<% if(form_stays_open = true)%>
+  <%# why not just re-render the form? that wouldn't utilize a possible do_new override which sets default values.%>
+  ActiveScaffold.reset_form('<%=element_form_id%>');
+  ActiveScaffold.replace_html('<%=element_messages_id(:action => :add_existing)%>', '<%=escape_javascript(render(:partial => 'form_messages'))%>');
+  <%# have to delay the focus, because there's no "firstElement" in prototype until at least one element is not disabled%>
+  <% if ActiveScaffold.js_framework == :prototype %>
+    page.delay 0.1 do
+      page << "ActiveScaffold.focus_first_element_of_form('<%=element_form_id%>');"
+    end
+  <% end %>
+<% else %>
+  ActiveScaffold.find_action_link('<%=element_form_id(:action => :new_existing)%>').close();
+<% end %>

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

@@ -0,0 +1,24 @@
+<%messages_id = active_scaffold_messages_id%>
+<%if controller.send(:successful?)%>
+  <%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....%>
+      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%>
+      <%= escape_javascript(controller.send(:render_component_into_view, render_parent_options))%>
+    <%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)%>
+    ActiveScaffold.replace('<%=active_scaffold_content_id%>', '<%=escape_javascript(render(:partial => 'list', :layout => false))%>');
+  <%else%>
+    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))%>');
+    <% 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%>
+  <%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%>
+ActiveScaffold.replace_html('<%=messages_id%>', '<%=escape_javascript(render(:partial => 'messages'))%>');

data/frontends/default/views/{edit_associated.js.rjs → edit_associated.js.erb}

@@ -1,3 +1,4 @@
+<%
 associated_form = render :partial => "#{subform_partial_for_column(@column)}_record", :locals => {:scope => @scope, :parent_record => @parent_record, :column => @column, :locked => @record.new_record? && @column.singular_association?}
 options = {:singular => false}
 if @column.singular_association?
@@ -7,5 +8,5 @@ else
     column = active_scaffold_config_for(@record.class).columns[@record.class.primary_key]
     options[:id] = active_scaffold_input_options(column, @scope)[:id]
   end
-end
-page.call 'ActiveScaffold.create_associated_record_form', sub_form_list_id(:association => @column.name), associated_form, options
+end %>
+ActiveScaffold.create_associated_record_form('<%=sub_form_list_id(:association => @column.name)%>','<%=escape_javascript(associated_form)%>', <%=options.to_json.html_safe%>);

data/frontends/default/views/form_messages.js.erb

@@ -0,0 +1 @@
+ActiveScaffold.replace_html('<%=element_messages_id%>','<%=escape_javascript(render(:partial => 'form_messages'))%>');

data/frontends/default/views/list.js.erb

@@ -0,0 +1 @@
+ActiveScaffold.replace_html('<%=active_scaffold_content_id%>','<%=escape_javascript(render(:partial => 'list', :layout => false))%>');

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

@@ -0,0 +1,13 @@
+<%if controller.send :successful?%>
+  ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','<%=escape_javascript(render(:partial => 'messages'))%>');
+  <%if @record%>
+  ActiveScaffold.update_row('<%=element_row_id(:action => :list, :id => @record.id)%>','<%=escape_javascript(render(:partial => 'list_record', :locals => {:record => @record}))%>');
+  <%end%>
+  <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
+      ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
+    <% 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)%>
+  ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','<%=escape_javascript(render(:partial => 'messages'))%>');
+  ActiveScaffold.scroll_to('<%=active_scaffold_messages_id%>');
+<%end%>

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.edit_after_create) %>
+      var link = $('<%=action_link_id 'edit', @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_mark_all.js.erb

@@ -0,0 +1,12 @@
+<%options = {:checked => mark_all,
+           :include_mark_all => true}%>
+ActiveScaffold.mark_records('<%=active_scaffold_tbody_id%>',<%=options.to_json.html_safe%>);
+<%if active_scaffold_config.model.marked.length>0 then %>
+  <%if active_scaffold_config.model.marked.length < @page.pager.count then%>
+    ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','<%="#{active_scaffold_config.model.marked.length.to_s} records marked. Press <a href=\"#{url_for(:action=>"mark_all",:mark_target=>"scope")}\">here</a> to select all #{@page.pager.count} records.".html_safe%>');
+  <%else%>
+    ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','<%="All #{@page.pager.count} records marked".html_safe%>');
+  <%end%>
+<%else%>
+  ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','');
+<%end%>

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/frontends/default/views/update_row.js.erb

@@ -0,0 +1 @@
+ActiveScaffold.update_row('<%=element_row_id(:action => 'list', :id => @record.id)%>','<%=escape_javascript(render(:partial => 'list_record', :locals => {:record => @record}))%>');

data/init.rb

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

data/lib/active_scaffold/actions/delete.rb

@@ -63,15 +63,13 @@ module ActiveScaffold::Actions
     def delete_authorized?(record = nil)
       (!nested? || !nested.readonly?) && authorized_for?(:crud_type => :delete)
     end
-
-    def destroy_formats
-      (default_formats + active_scaffold_config.formats + active_scaffold_config.delete.formats).uniq
-    end
     private
     def delete_authorized_filter
       link = active_scaffold_config.delete.link || active_scaffold_config.delete.class.link
       raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method)
     end
-    
+    def destroy_formats
+      (default_formats + active_scaffold_config.formats + active_scaffold_config.delete.formats).uniq
+    end
   end
 end

data/lib/active_scaffold/actions/field_search.rb

@@ -43,16 +43,12 @@ module ActiveScaffold::Actions
     end
 
     def do_search
-      prepare_search_conditions(search_params)
-    end
-
-    def prepare_search_conditions(params)
-      unless params.nil?
+      unless search_params.nil?
         text_search = active_scaffold_config.field_search.text_search
         search_conditions = []
         human_condition_columns = [] if active_scaffold_config.field_search.human_conditions
         columns = field_search_columns
-        params.each do |key, value|
+        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)
           unless search_condition.blank?

data/lib/active_scaffold/actions/list.rb

@@ -3,7 +3,6 @@ module ActiveScaffold::Actions
     def self.included(base)
       base.before_filter :list_authorized_filter, :only => [:index, :row]
       base.helper_method :list_columns
-      base.helper_method :save_current_page_num
     end
 
     def index
@@ -33,7 +32,10 @@ module ActiveScaffold::Actions
       end
     end
     def list_respond_to_js
-      if params.delete(:embedded)
+      if params[:adapter]
+        render(:partial => 'list_with_header')
+      elsif params[:embedded]
+        params.delete(:embedded)
         render(:partial => 'list_with_header')
       else
         render :action => 'list.js'
@@ -64,7 +66,7 @@ module ActiveScaffold::Actions
 
       options = { :sorting => active_scaffold_config.list.user.sorting,
         :count_includes => active_scaffold_config.list.user.count_includes }
-      paginate = (params[:format].nil?) ? (accepts? :html, :js) : ['html', 'js'].include?(params[:format].to_s)
+      paginate = (params[:format].nil?) ? (accepts? :html, :js) : ['html', 'js'].include?(params[:format])
       if paginate
         options.merge!({
             :per_page => active_scaffold_config.list.user.per_page,
@@ -73,8 +75,12 @@ module ActiveScaffold::Actions
           })
       end
 
-      @records = find_page(options);
-      @records
+      page = find_page(options);
+      if page.items.blank? && !page.pager.infinite?
+        page = page.pager.last
+        active_scaffold_config.list.user.page = page.number
+      end
+      @page, @records = page, page.items
     end
 
     def each_record_in_page
@@ -156,6 +162,11 @@ 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?
+    end
 
     def list_formats
       (default_formats + active_scaffold_config.formats + active_scaffold_config.list.formats).uniq
@@ -170,15 +181,6 @@ module ActiveScaffold::Actions
       (default_formats + active_scaffold_config.formats).uniq
     end
 
-    def save_current_page_num
-      active_scaffold_config.list.user.page = @records.current_page unless active_scaffold_config.list.pagination == false
-    end
-
-    private
-    def list_authorized_filter
-      raise ActiveScaffold::ActionNotAllowed unless list_authorized?
-    end
-
     def list_columns
       active_scaffold_config.list.columns.collect_visible
     end

data/lib/active_scaffold/actions/search.rb

@@ -35,13 +35,13 @@ module ActiveScaffold::Actions
       end
     end
 
-    def search_formats
-      (default_formats + active_scaffold_config.formats + active_scaffold_config.search.formats).uniq
-    end
     private
     def search_authorized_filter
       link = active_scaffold_config.search.link || active_scaffold_config.search.class.link
       raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method)
     end
+    def search_formats
+      (default_formats + active_scaffold_config.formats + active_scaffold_config.search.formats).uniq
+    end
   end
 end

data/lib/active_scaffold/active_record_permissions.rb

@@ -64,7 +64,6 @@ module ActiveRecordPermissions
     def self.included(base)
       base.extend SecurityMethods
       base.send :include, SecurityMethods
-      base.class_attribute :auth_column_read_methods
     end
 
     # Because any class-level queries get delegated to the instance level via a new record,
@@ -83,6 +82,8 @@ module ActiveRecordPermissions
       # options[:column] should be the name of a model attribute
       # options[:action] is the name of a method
       def authorized_for?(options = {})
+        raise ArgumentError, "unknown crud type #{options[:crud_type]}" if options[:crud_type] and ![:create, :read, :update, :delete].include?(options[:crud_type])
+
         # column_authorized_for_crud_type? has the highest priority over other methods,
         # you can disable a crud verb and enable that verb for a column
         # (for example, disable update and enable inplace_edit in a column)
@@ -111,30 +112,6 @@ module ActiveRecordPermissions
         return ActiveRecordPermissions.default_permission
       end
 
-      def authorized_for_read_column?(column)
-        self.class.auth_column_read_methods ||= {}
-        methods = self.class.auth_column_read_methods[column]
-        if methods.nil?
-          method = column_and_crud_type_security_method(column, :read)
-          methods = if method && respond_to?(method)
-            [method]
-          else
-            [column_security_method(column),
-            crud_type_security_method(:read)].compact.select {|m| respond_to?(m)}
-          end
-          self.class.auth_column_read_methods[column] = methods
-        end
-
-        # if any method returns false, then return false
-        return false if methods.any? {|m| !send(m)}
-
-        # if any method actually exists then it must've returned true, so return true
-        return true unless methods.empty?
-
-        # if no method exists, return the default permission
-        return ActiveRecordPermissions.default_permission
-      end
-
       private
 
       def column_security_method(column)

data/lib/active_scaffold/attribute_params.rb

@@ -39,7 +39,6 @@ module ActiveScaffold
       crud_type = parent_record.new_record? ? :create : :update
       return parent_record unless parent_record.authorized_for?(:crud_type => crud_type)
 
-      attributes = {} unless attributes.is_a?(Hash)
       multi_parameter_attributes = {}
       attributes.each do |k, v|
         next unless k.include? '('
@@ -88,7 +87,7 @@ module ActiveScaffold
     end
     
     def manage_nested_record_from_params(parent_record, column, attributes)
-      record = nested_record_for_action(parent_record, column, attributes)
+      record = find_or_create_for_params(attributes, column, parent_record)
       if record
         record_columns = active_scaffold_config_for(column.association.klass).subform.columns
         update_record_from_params(record, record_columns, attributes)
@@ -96,23 +95,6 @@ module ActiveScaffold
       end
       record
     end
-
-    def nested_record_for_action(parent_record, column, attributes)
-      associated_action = attributes.delete(:associated_action)
-
-      case associated_action.to_sym
-      when :create then create_nested_record(column, parent_record)
-      when :update then find_nested_record(attributes[:id], column, parent_record)
-      when :empty then nil
-      when :delete then nil
-      when :create_or_empty then
-        if column.show_blank_record && attributes_hash_is_empty?(attributes, column.association.klass)
-          nil
-        else
-          create_nested_record(column, parent_record)
-        end
-      end
-    end
     
     def column_value_from_param_value(parent_record, column, value)
       # convert the value, possibly by instantiating associated objects
@@ -135,11 +117,8 @@ module ActiveScaffold
         # convert empty strings into nil. this works better with 'null => true' columns (and validations),
         # and 'null => false' columns should just convert back to an empty string.
         # ... but we can at least check the ConnectionAdapter::Column object to see if nulls are allowed
-        if value.is_a? String and value.empty? and !column.column.nil? and column.column.null
-          nil
-        else
-          column.stripped_value(value)
-        end
+        value = nil if value.is_a? String and value.empty? and !column.column.nil? and column.column.null
+        value
       end
     end
 
@@ -170,35 +149,33 @@ module ActiveScaffold
       end
     end
 
-    def create_nested_record(parent_column, parent_record)
+    # Attempts to create or find an instance of klass (which must be an ActiveRecord object) from the
+    # request parameters given. If params[:id] exists it will attempt to find an existing object
+    # otherwise it will build a new one.
+    def find_or_create_for_params(params, parent_column, parent_record)
+      current = parent_record.send(parent_column.name)
       klass = parent_column.association.klass
-      
-      if klass.authorized_for?(:crud_type => :create)
-        if parent_column.singular_association?
-          return parent_record.send("build_#{parent_column.name}")
-        else
-          return parent_record.send(parent_column.name).build
-        end
-      end
-    end
+      return nil if parent_column.show_blank_record and attributes_hash_is_empty?(params, klass)
 
-    def find_nested_record(id, parent_column, parent_record)
-      klass = parent_column.association.klass
-      if id
-        current = parent_record.send(parent_column.name)
-        Rails.logger.info("find_nested_record: id: #{id}, curent: #{current.inspect}")
+      if params.has_key? :id
         # modifying the current object of a singular association
-        if current && current.is_a?(ActiveRecord::Base) && current.id.to_s == id
+        if current and current.is_a? ActiveRecord::Base and current.id.to_s == params[:id]
           return current
         # modifying one of the current objects in a plural association
-        elsif current && current.respond_to?(:any?) && current.any? {|o| o.id.to_s == id}
-          return current.detect {|o| o.id.to_s == id}
+        elsif current and current.respond_to?(:any?) and current.any? {|o| o.id.to_s == params[:id]}
+          return current.detect {|o| o.id.to_s == params[:id]}
         # attaching an existing but not-current object
         else
-          return klass.find(id)
+          return klass.find(params[:id])
         end
       else
-        Rails.logger.info("Activescaffold find_nested_record missing id")
+        if klass.authorized_for?(:crud_type => :create)
+          if parent_column.singular_association?
+            return parent_record.send("build_#{parent_column.name}")
+          else
+            return parent_record.send(parent_column.name).build
+          end
+        end
       end
     end
 

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

@@ -3,7 +3,7 @@ ActiveScaffold::Bridges.bridge "CalendarDateSelect" do
     # 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_method_names.include?("initialize_with_calendar_date_select")
+    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_calendar_date_select")
       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