active_scaffold 3.1.14 → 3.1.15

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

@@ -14,5 +14,6 @@
 <% require_asset "prototype/form_enhancements" %>
 <% require_asset "prototype/rico_corner" %>
 <% end %>
+ActiveScaffold.config = <%= ActiveScaffold.js_config.to_json %>;
 <% ActiveScaffold.javascripts.each {|js| require_asset js} %>
 <% ActiveScaffold::Bridges.all_javascripts.each {|js| require_asset js} %>

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

@@ -894,6 +894,7 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
     this.enable();
     this.adapter.remove();
     if (this.hide_target) this.target.show();
+    if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(this.target);
   },
 
   reload: function() {

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

@@ -791,6 +791,7 @@ ActiveScaffold.ActionLink.Abstract = Class.create({
     this.enable();
     this.adapter.remove();
     if (this.hide_target) this.target.show();
+    if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(this.target);
   },
 
   reload: function() {

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

@@ -1,4 +1,4 @@
-<% url_options = params_for(:action => :index, :escape => false, :search => nil) -%>
+<% url_options = params_for(:action => :index, :search => nil) -%>
 <%=
 options = {:id => element_form_id(:action => 'search'),
            :class => "as_form search",

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

@@ -11,8 +11,8 @@ show_add_new = column_show_add_new(column, associated, @record)
 
 return unless show_add_new or show_add_existing
 
-edit_associated_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :associated_id => '--ID--', :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]) if show_add_existing
-add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]) if show_add_new
+edit_associated_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :associated_id => '--ID--', :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]) if show_add_existing
+add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]) if show_add_new
 
 -%>
 <div class="footer-wrapper">

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

@@ -19,7 +19,7 @@
       <% search_link = ActiveScaffold::DataStructures::ActionLink.new('index', :label => :click_to_reset, :type => :member, :position => false)
       action_links = ActiveScaffold::DataStructures::ActionLinks.new
       action_links.add(search_link)  -%>
-      <%= render :partial => 'list_actions', :locals => {:record => new_model, :url_options => params_for(:escape => false, :search => ''), :action_links => action_links.member} %>
+      <%= render :partial => 'list_actions', :locals => {:record => new_model, :url_options => params_for(:search => ''), :action_links => action_links.member} %>
     <% else %>
       <td class='actions'><%= '<p class="empty-message">&nbsp;</p>'.html_safe if @page.items.empty? %></td>
     <% end -%>

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

@@ -7,7 +7,7 @@ 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 %>">
+<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)).html_safe %>">
   <%= 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? %>

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

@@ -1,5 +1,5 @@
 <% live_search = active_scaffold_config.search.live? -%>
-<% url_options =  params_for(:action => :index, :escape => false).delete_if{|k,v| k == 'search'} -%>
+<% url_options =  params_for(:action => :index).delete_if{|k,v| k == 'search'} -%>
 <%=
 options = {:id => element_form_id(:action => 'search'),
            :class => "as_form search",

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

@@ -4,7 +4,7 @@
     <%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))%>');
+      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))%>');
       <%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))%>
@@ -13,7 +13,7 @@
   <%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))%>');
+    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))%>');
     <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
       ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
     <% end %>
@@ -21,4 +21,4 @@
 <%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'))%>');
+ActiveScaffold.replace_html('<%=messages_id%>', '<%=escape_javascript(render(:partial => 'messages'))%>');

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

@@ -2,6 +2,7 @@ module ActiveScaffold::Actions
   module Core
     def self.included(base)
       base.class_eval do
+        after_filter :clean_up_session
         after_filter :clear_flashes
       end
       base.helper_method :nested?
@@ -17,6 +18,9 @@ module ActiveScaffold::Actions
     end
     
     protected
+    def clean_up_session
+      backup = session.reject! { |k, v| k.is_a?(String) && v != active_scaffold_session_storage && k.start_with?('as:')}
+    end
 
     def nested?
       false
@@ -165,7 +169,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.new(build_options || {})
+      model.respond_to?(:build) ? model.build(build_options || {}) : model.new
     end
 
     private

data/lib/active_scaffold/actions/nested.rb

@@ -17,11 +17,6 @@ module ActiveScaffold::Actions
 
     protected
     def nested
-      @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_config.list.hide_nested_column ? [] : [:list])
-        active_scaffold_constraints[:id] = params[:id] if @nested.belongs_to?
-      end
       @nested
     end
     
@@ -31,11 +26,12 @@ module ActiveScaffold::Actions
     
     def set_nested
       if params[:parent_scaffold] && ((params[:association] && params[:assoc_id]) || params[:named_scope])
-        @nested = nil
-        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_scaffold, :association, :named_scope, :assoc_id].include? key.to_sym}
+        @nested = ActiveScaffold::DataStructures::NestedInfo.get(active_scaffold_config.model, params)
+        unless @nested.nil?
+          register_constraints_with_action_columns(@nested.constrained_fields,  active_scaffold_config.list.hide_nested_column ? [] : [:list])
+          active_scaffold_constraints[:id] = params[:id] if @nested.belongs_to?
+        end
+        #params.delete_if {|key, value| [:parent_scaffold, :association, :named_scope, :assoc_id].include? key.to_sym}
       end
     end
     

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

@@ -17,11 +17,6 @@ module ActiveScaffold::Actions
 
     protected
     def nested
-      @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_config.list.hide_nested_column ? [] : [:list])
-        active_scaffold_constraints[:id] = params[:id] if @nested.belongs_to?
-      end
       @nested
     end
     
@@ -31,11 +26,16 @@ module ActiveScaffold::Actions
     
     def set_nested
       if params[:parent_scaffold] && ((params[:association] && params[:assoc_id]) || params[:named_scope])
-        @nested = nil
-        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_scaffold, :association, :named_scope, :assoc_id].include? key.to_sym}
+        nested_info = {:parent_scaffold => params[:parent_scaffold].to_s,
+                       :association => params[:association],
+                       :named_scope => params[:named_scope],
+                       :parent_id => params[:assoc_id]}
+        @nested = ActiveScaffold::DataStructures::NestedInfo.get(active_scaffold_config.model, nested_info)
+        unless @nested.nil?
+          register_constraints_with_action_columns(@nested.constrained_fields,  active_scaffold_config.list.hide_nested_column ? [] : [:list])
+          active_scaffold_constraints[:id] = params[:id] if @nested.belongs_to?
+        end
+        #params.delete_if {|key, value| [:parent_scaffold, :association, :named_scope, :assoc_id].include? key.to_sym}
       end
     end
     
@@ -83,7 +83,6 @@ module ActiveScaffold::Actions
     
     def beginning_of_chain
       if nested? && nested.association && !nested.association.belongs_to?
-        debugger
         if nested.association.collection?
           nested.parent_scope.send(nested.association.name)
         elsif nested.child_association.belongs_to?

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

@@ -25,7 +25,8 @@ module ActiveScaffold::Config
     # delegate
     def crud_type; self.class.crud_type end
 
-    def label(model = @core.label(:count => 1))
+    def label(model = nil)
+      model ||= @core.label(:count => 1)
       @label.nil? ? model : as_(@label, :model => model)
     end
     
@@ -43,6 +44,7 @@ module ActiveScaffold::Config
       def initialize(conf, storage, params)
         # the session hash relevant to this action
         @session = storage
+        debugger
         # all the request params
         @params = params
         # the configuration object for this action

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

@@ -0,0 +1,195 @@
+module ActiveScaffold::Config
+  class List < Base
+    self.crud_type = :read
+
+    def initialize(core_config)
+      super
+      # inherit from global scope
+      # full configuration path is: defaults => global table => local table
+      @per_page = self.class.per_page
+      @page_links_window = self.class.page_links_window
+      
+      # originates here
+      @sorting = ActiveScaffold::DataStructures::Sorting.new(@core.columns)
+      @sorting.set_default_sorting(@core.model)
+
+      # inherit from global scope
+      @empty_field_text = self.class.empty_field_text
+      @association_join_text = self.class.association_join_text
+      @pagination = self.class.pagination
+      @show_search_reset = true
+      @mark_records = self.class.mark_records
+    end
+
+    # global level configuration
+    # --------------------------
+    # how many records to show per page
+    cattr_accessor :per_page
+    @@per_page = 15
+
+    # how many page links around current page to show
+    cattr_accessor :page_links_window
+    @@page_links_window = 2
+
+    # what string to use when a field is empty
+    cattr_accessor :empty_field_text
+    @@empty_field_text = '-'
+
+    # what string to use to join records from plural associations
+    cattr_accessor :association_join_text
+    @@association_join_text = ', '
+
+    # What kind of pagination to use:
+    # * true: The usual pagination
+    # * :infinite: Treat the source as having an infinite number of pages (i.e. don't count the records; useful for large tables where counting is slow and we don't really care anyway)
+    # * false: Disable pagination
+    cattr_accessor :pagination
+    @@pagination = true
+
+    # Add a checkbox in front of each record to mark them and use them with a batch action later
+    cattr_accessor :mark_records
+
+    # instance-level configuration
+    # ----------------------------
+
+    # provides access to the list of columns specifically meant for the Table to use
+    def columns
+      self.columns = @core.columns._inheritable unless @columns # lazy evaluation
+      @columns
+    end
+    
+    public :columns=
+
+    # how many rows to show at once
+    attr_accessor :per_page
+
+    # how many page links around current page to show
+    attr_accessor :page_links_window
+
+    # What kind of pagination to use:
+    # * true: The usual pagination
+    # * :infinite: Treat the source as having an infinite number of pages (i.e. don't count the records; useful for large tables where counting is slow and we don't really care anyway)
+    # * false: Disable pagination
+    attr_accessor :pagination
+
+    # what string to use when a field is empty
+    attr_accessor :empty_field_text
+
+    # what string to use to join records from plural associations
+    attr_accessor :association_join_text
+
+    # show a link to reset the search next to filtered message
+    attr_accessor :show_search_reset
+
+    # Add a checkbox in front of each record to mark them and use them with a batch action later
+    attr_accessor :mark_records
+
+    # the default sorting. should be an array of hashes of {column_name => direction}, e.g. [{:a => 'desc'}, {:b => 'asc'}]. to just sort on one column, you can simply provide a hash, though, e.g. {:a => 'desc'}.
+    def sorting=(val)
+      val = [val] if val.is_a? Hash
+      sorting.clear
+      val.each { |clause| sorting.add *Array(clause).first }
+    end
+    def sorting
+      @sorting ||= ActiveScaffold::DataStructures::Sorting.new(@core.columns)
+    end
+    
+    # overwrite the includes used for the count sql query
+    attr_accessor :count_includes
+
+    # the label for this List action. used for the header.
+    attr_writer :label
+    def label
+      @label ? as_(@label, :count => 2) : @core.label(:count => 2)
+    end
+
+    attr_writer :no_entries_message
+    def no_entries_message
+      @no_entries_message ? @no_entries_message : :no_entries
+    end
+
+    attr_writer :filtered_message
+    def filtered_message
+      @filtered_message ? @filtered_message : :filtered
+    end
+    
+    attr_writer :always_show_search
+    def always_show_search
+      @always_show_search && !search_partial.blank?
+    end
+    
+    def search_partial
+      return "search" if @core.actions.include?(:search)
+      return "field_search" if @core.actions.include?(:field_search)
+    end
+    
+    # always show create
+    attr_writer :always_show_create
+    def always_show_create
+      @always_show_create && @core.actions.include?(:create)
+    end
+
+    # if list view is nested hide nested_column
+    attr_writer :hide_nested_column
+    def hide_nested_column
+      @hide_nested_column.nil? ? true : @hide_nested_column
+    end
+    
+    # might be set to open nested_link automatically in view
+    # conf.nested.add_link(:players)
+    # conf.list.nested_auto_open = {:players => 2}
+    # will open nested players view if there are 2 or less records in parent
+    attr_accessor :nested_auto_open
+    
+    class UserSettings < UserSettings
+      # This label has alread been localized.
+      def label
+        @session[:label] ? @session[:label] : @conf.label
+      end
+
+      def per_page
+        @session['per_page'] = @params['limit'].to_i if @params.has_key? 'limit'
+        @session['per_page'] || @conf.per_page
+      end
+
+      def page
+        @session['page'] = @params['page'] if @params.has_key? 'page'
+        @session['page'] || 1
+      end
+
+      def page=(value = nil)
+        @session['page'] = value
+      end
+
+      attr_reader :nested_default_sorting
+
+      def nested_default_sorting=(options)
+        @nested_default_sorting ||= @conf.sorting.clone
+        @nested_default_sorting.set_nested_sorting(options[:table_name], options[:default_sorting])
+      end
+
+      def default_sorting
+        nested_default_sorting.nil? ? @conf.sorting : nested_default_sorting
+      end
+
+      def sorting
+        # we want to store as little as possible in the session, but we want to return a Sorting data structure. so we recreate it each page load based on session data.
+        debugger
+        @session['sort'] = [@params['sort'], @params['sort_direction']] if @params['sort'] and @params['sort_direction']
+        @session['sort'] = nil if @params['sort_direction'] == 'reset'
+
+        if @session['sort']
+          sorting = @conf.sorting.clone
+          sorting.set(*@session['sort'])
+          return sorting
+        else
+          return default_sorting
+        end
+      end
+      
+      def count_includes
+        @conf.count_includes
+      end
+    end
+  end
+end

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -1,31 +1,28 @@
 module ActiveScaffold::DataStructures
   class NestedInfo
-    def self.get(model, session_storage)
-      if session_storage[:nested].nil? 
-        nil
-      else
-        session_info = session_storage[:nested].clone
-        begin
-          session_info[:parent_scaffold] = "#{session_info[:parent_scaffold].to_s.camelize}Controller".constantize
-          session_info[:parent_model] = session_info[:parent_scaffold].active_scaffold_config.model
-          session_info[:association] = session_info[:parent_model].reflect_on_association(session_info[:name])
-          unless session_info[:association].nil?
-            ActiveScaffold::DataStructures::NestedInfoAssociation.new(model, session_info)
-          else
-            ActiveScaffold::DataStructures::NestedInfoScope.new(model, session_info)
-          end
-        rescue ActiveScaffold::ControllerNotFound
-          nil
+    def self.get(model, params)
+      nested_info = {}
+      begin
+        nested_info[:name] = (params[:association] || params[:named_scope]).to_sym
+        nested_info[:parent_scaffold] = "#{params[:parent_scaffold].to_s.camelize}Controller".constantize
+        nested_info[:parent_model] = nested_info[:parent_scaffold].active_scaffold_config.model
+        nested_info[:parent_id] = params[nested_info[:parent_model].name.foreign_key]
+        unless nested_info[:association].nil?
+          ActiveScaffold::DataStructures::NestedInfoAssociation.new(model, nested_info)
+        else
+          ActiveScaffold::DataStructures::NestedInfoScope.new(model, nested_info)
         end
+      rescue ActiveScaffold::ControllerNotFound
+        nil
       end
     end
     
     attr_accessor :association, :child_association, :parent_model, :parent_scaffold, :parent_id, :constrained_fields, :scope
         
-    def initialize(model, session_info)
-      @parent_model = session_info[:parent_model]
-      @parent_id = session_info[:parent_id]
-      @parent_scaffold = session_info[:parent_scaffold]
+    def initialize(model, nested_info)
+      @parent_model = nested_info[:parent_model]
+      @parent_id = nested_info[:parent_id]
+      @parent_scaffold = nested_info[:parent_scaffold]
     end
     
     def to_params
@@ -64,9 +61,9 @@ module ActiveScaffold::DataStructures
   end
   
   class NestedInfoAssociation < NestedInfo
-    def initialize(model, session_info)
-      super(model, session_info)
-      @association = session_info[:association]
+    def initialize(model, nested_info)
+      super(model, nested_info)
+      @association = parent_model.reflect_on_association(nested_info[:name])
       iterate_model_associations(model)
     end
     
@@ -126,9 +123,9 @@ module ActiveScaffold::DataStructures
   end
   
   class NestedInfoScope < NestedInfo
-    def initialize(model, session_info)
-      super(model, session_info)
-      @scope = session_info[:name]
+    def initialize(model, nested_info)
+      super(model, nested_info)
+      @scope = nested_info[:name]
       @constrained_fields = [] 
     end
     

data/lib/active_scaffold/data_structures/nested_info.rb~

@@ -1,31 +1,29 @@
 module ActiveScaffold::DataStructures
   class NestedInfo
-    def self.get(model, session_storage)
-      if session_storage[:nested].nil? 
-        nil
-      else
-        session_info = session_storage[:nested].clone
-        begin
-          session_info[:parent_scaffold] = "#{session_info[:parent_scaffold].to_s.camelize}Controller".constantize
-          session_info[:parent_model] = session_info[:parent_scaffold].active_scaffold_config.model
-          session_info[:association] = session_info[:parent_model].reflect_on_association(session_info[:name])
-          unless session_info[:association].nil?
-            ActiveScaffold::DataStructures::NestedInfoAssociation.new(model, session_info)
-          else
-            ActiveScaffold::DataStructures::NestedInfoScope.new(model, session_info)
-          end
-        rescue ActiveScaffold::ControllerNotFound
-          nil
+    def self.get(model, params)
+      nested_info = {}
+      begin
+        nested_info[:name] = (params[:association] || params[:named_scope]).to_sym
+        nested_info[:parent_scaffold] = "#{params[:parent_scaffold].to_s.camelize}Controller".constantize
+        nested_info[:parent_model] = nested_info[:parent_scaffold].active_scaffold_config.model
+        unless nested_info[:association].nil?
+          nested_info[:parent_id] = params[nested_info[:parent_model].name.foreign_key]
+          ActiveScaffold::DataStructures::NestedInfoAssociation.new(model, nested_info)
+        else
+          nested_info[:parent_id] = params[:assoc_id]
+          ActiveScaffold::DataStructures::NestedInfoScope.new(model, nested_info)
         end
+      rescue ActiveScaffold::ControllerNotFound
+        nil
       end
     end
     
     attr_accessor :association, :child_association, :parent_model, :parent_scaffold, :parent_id, :constrained_fields, :scope
         
-    def initialize(model, session_info)
-      @parent_model = session_info[:parent_model]
-      @parent_id = session_info[:parent_id]
-      @parent_scaffold = session_info[:parent_scaffold]
+    def initialize(model, nested_info)
+      @parent_model = nested_info[:parent_model]
+      @parent_id = nested_info[:parent_id]
+      @parent_scaffold = nested_info[:parent_scaffold]
     end
     
     def to_params
@@ -61,15 +59,12 @@ module ActiveScaffold::DataStructures
     def sorted?
       false
     end
-    
-    def name
-    end
   end
   
   class NestedInfoAssociation < NestedInfo
-    def initialize(model, session_info)
-      super(model, session_info)
-      @association = session_info[:association]
+    def initialize(model, nested_info)
+      super(model, nested_info)
+      @association = parent_model.reflect_on_association(nested_info[:name])
       iterate_model_associations(model)
     end
     
@@ -129,9 +124,9 @@ module ActiveScaffold::DataStructures
   end
   
   class NestedInfoScope < NestedInfo
-    def initialize(model, session_info)
-      super(model, session_info)
-      @scope = session_info[:name]
+    def initialize(model, nested_info)
+      super(model, nested_info)
+      @scope = nested_info[:name]
       @constrained_fields = [] 
     end
     

data/lib/active_scaffold/extensions/routing_mapper.rb

@@ -28,6 +28,20 @@ module ActionDispatch
             ActionDispatch::Routing::ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:member].each {|name, type| send(type, name)}
           end
         end
+        
+        def as_nested_resources(*resources)
+          options = resources.extract_options!
+          resources.each do |resource|
+            resources(resource, options.merge(:parent_scaffold => merge_module_scope(@scope[:module], parent_resource.plural), :association => resource)) { yield if block_given? }
+          end
+        end
+        
+        def as_scoped_routes(*scopes)
+          options = scopes.extract_options!
+          scopes.each do |scope|
+            resources(scope, options.merge(:parent_scaffold => merge_module_scope(@scope[:module], parent_resource.plural), :named_scope => scope, :controller => parent_resource.plural)) { yield if block_given? }
+          end
+        end
       end
     end
   end

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

@@ -28,6 +28,20 @@ module ActionDispatch
             ActionDispatch::Routing::ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:member].each {|name, type| send(type, name)}
           end
         end
+        
+        def as_nested_resources(*resources)
+          options = resources.extract_options!
+          resources.each do |resource|
+            resources(resource, options.merge(:parent_scaffold => merge_module_scope(@scope[:module], parent_resource.plural), :association => resource)) { yield if block_given? }
+          end
+        end
+        
+        def as_scoped_routes(*scopes)
+          options = scopes.extract_options!
+          scopes.each do |scope|
+            resources(parent_resource.plural, options.merge(:parent_scaffold => merge_module_scope(@scope[:module], parent_resource.plural), :named_scope => scope, :as => :scope)) { yield if block_given? }
+          end
+        end
       end
     end
   end

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -30,12 +30,12 @@ module ActiveScaffold
           parameters = {}
           if params[:parent_controller]
             parameters[:controller] = params[:parent_controller]
-            parameters[:eid] = params[:parent_controller]
+            #parameters[:eid] = params[:parent_controller]
           end
           parameters.merge! nested.to_params if nested?
           if params[:parent_sti]
             parameters[:controller] = params[:parent_sti]
-            parameters[:eid] = nil
+            #parameters[:eid] = nil
           end
           parameters[:parent_column] = nil
           parameters[:parent_id] = nil

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

@@ -30,11 +30,9 @@ module ActiveScaffold
           parameters = {}
           if params[:parent_controller]
             parameters[:controller] = params[:parent_controller]
-            parameters[:eid] = params[:parent_controller]
-          end
-          if nested?
-            parameters.merge! nested.to_params
+            #parameters[:eid] = params[:parent_controller]
           end
+          parameters.merge! nested.to_params if nested?
           if params[:parent_sti]
             parameters[:controller] = params[:parent_sti]
             parameters[:eid] = nil

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -297,7 +297,7 @@ module ActiveScaffold
         elsif inplace_edit_cloning?(column)
           tag_options['data-ie_mode'] = :clone
         elsif column.inplace_edit == :ajax
-          url = url_for(:controller => params_for[:controller], :action => 'render_field', :id => '__id__', :column => column.name, :update_column => column.name, :in_place_editing => true, :escape => false)
+          url = url_for(:controller => params_for[:controller], :action => 'render_field', :id => '__id__', :column => column.name, :update_column => column.name, :in_place_editing => true)
           plural = column.plural_association? && !override_form_field?(column) && [:select, :record_select].include?(column.form_ui)
           tag_options['data-ie_render_url'] = url
           tag_options['data-ie_mode'] = :ajax

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -188,14 +188,10 @@ module ActiveScaffold
       
       def url_options_for_nested_link(column, record, link, url_options, options = {})
         if column && column.association 
-          url_options[:assoc_id] = url_options.delete(:id)
+          url_options[column.association.active_record.name.foreign_key.to_sym] = url_options.delete(:id)
           url_options[:id] = record.send(column.association.name).id if column.singular_association? && record.send(column.association.name).present?
-          link.eid = "#{controller_id.from(3)}_#{record.id}_#{column.association.name}" unless options.has_key?(:reuse_eid)
-          url_options[:eid] = link.eid
         elsif link.parameters && link.parameters[:named_scope]
-          url_options[:assoc_id] = url_options.delete(:id)
-          link.eid = "#{controller_id.from(3)}_#{record.id}_#{link.parameters[:named_scope]}" unless options.has_key?(:reuse_eid)
-          url_options[:eid] = link.eid
+          url_options[active_scaffold_config.model.name.foreign_key.to_sym] = url_options.delete(:id)
         end
       end
 

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

@@ -188,14 +188,11 @@ module ActiveScaffold
       
       def url_options_for_nested_link(column, record, link, url_options, options = {})
         if column && column.association 
-          url_options[:assoc_id] = url_options.delete(:id)
+          url_options[column.association.active_record.name.foreign_key.to_sym] = url_options.delete(:id)
           url_options[:id] = record.send(column.association.name).id if column.singular_association? && record.send(column.association.name).present?
-          link.eid = "#{controller_id.from(3)}_#{record.id}_#{column.association.name}" unless options.has_key?(:reuse_eid)
-          url_options[:eid] = link.eid
         elsif link.parameters && link.parameters[:named_scope]
-          url_options[:assoc_id] = url_options.delete(:id)
-          link.eid = "#{controller_id.from(3)}_#{record.id}_#{link.parameters[:named_scope]}" unless options.has_key?(:reuse_eid)
-          url_options[:eid] = link.eid
+          index = url_options[:parent_scaffold] ? url_options[:parent_scaffold].camelize.singularize.foreign_key.to_sym : :assoc_id
+          url_options[index] = url_options.delete(:id)
         end
       end
 
@@ -239,7 +236,7 @@ module ActiveScaffold
       end
 
       def as_main_div_class
-        classes = ["active-scaffold", "active-scaffold-#{controller_id}", "#{params[:controller]}-view", "#{active_scaffold_config.theme}-theme"]
+        classes = ["active-scaffold", "active-scaffold-#{controller_id}", "#{id_from_controller params[:controller]}-view", "#{active_scaffold_config.theme}-theme"]
         classes << "as_touch" if touch_device?
         classes.join(' ')
       end

data/lib/active_scaffold/version.rb

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

data/lib/active_scaffold.rb

@@ -13,6 +13,7 @@ require 'active_scaffold/responds_to_parent'
 
 require 'active_scaffold/version'
 require 'active_scaffold/engine' unless defined? ACTIVE_SCAFFOLD_PLUGIN
+require 'json'  # for js_config
 
 module ActiveScaffold
   autoload :AttributeParams, 'active_scaffold/attribute_params'
@@ -131,6 +132,14 @@ module ActiveScaffold
     end
   end
 
+  def self.js_config=(config)
+    @@js_config = config
+  end
+
+  def self.js_config
+    @@js_config ||= {:scroll_on_close => true}
+  end
+
   # exclude bridges you do not need
   # name of bridge subdir should be used to exclude it
   # eg

data/lib/active_scaffold.rb~

@@ -85,8 +85,8 @@ module ActiveScaffold
 
   def active_scaffold_session_storage(id = (params[:eid] || params[:controller]))
     session_index = "as:#{id}"
-    session[session_index] ||= {}
-    session[session_index]
+    cookies[session_index] = {:value => {}, :expires => 1.hour.from_now} unless cookies[session_index].present?
+    cookies[session_index]
   end
 
   # at some point we need to pass the session and params into config. we'll just take care of that before any particular action occurs by passing those hashes off to the UserSettings class of each action.
@@ -95,6 +95,7 @@ module ActiveScaffold
       active_scaffold_config.actions.each do |action_name|
         conf_instance = active_scaffold_config.send(action_name) rescue next
         next if conf_instance.class::UserSettings == ActiveScaffold::Config::Base::UserSettings # if it hasn't been extended, skip it
+        debugger
         active_scaffold_session_storage[action_name] ||= {}
         conf_instance.user = conf_instance.class::UserSettings.new(conf_instance, active_scaffold_session_storage[action_name], params)
       end
@@ -266,7 +267,7 @@ module ActiveScaffold
           column.actions_for_association_links.delete :new unless actions.include? :create
           column.actions_for_association_links.delete :edit unless actions.include? :update
           column.actions_for_association_links.delete :show unless actions.include? :show
-          ActiveScaffold::DataStructures::ActionLink.new(nil, options.merge({:crud_type => nil, :html_options => {:class => column.name}}))
+          ActiveScaffold::DataStructures::ActionLink.new(nil, options.merge(:html_options => {:class => column.name}))
         end 
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 3
   - 1
-  - 14
-  version: 3.1.14
+  - 15
+  version: 3.1.15
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-12 00:00:00 Z
+date: 2012-01-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -251,6 +251,7 @@ files:
 - lib/active_scaffold/config/search.rb~
 - lib/active_scaffold/config/nested.rb~
 - lib/active_scaffold/config/base.rb~
+- lib/active_scaffold/config/list.rb~
 - lib/active_scaffold/configurable.rb
 - lib/active_scaffold/constraints.rb
 - lib/active_scaffold/data_structures/action_columns.rb
@@ -347,11 +348,11 @@ files:
 - lib/active_scaffold/extensions/unsaved_associated.rb
 - lib/active_scaffold/extensions/unsaved_record.rb
 - lib/active_scaffold/extensions/usa_state.rb
+- lib/active_scaffold/extensions/routing_mapper.rb~
 - lib/active_scaffold/extensions/action_controller_rendering.rb~
 - lib/active_scaffold/extensions/action_view_rendering.rb~
 - lib/active_scaffold/extensions/cache_association.rb~
 - lib/active_scaffold/extensions/reverse_associations.rb~
-- lib/active_scaffold/extensions/routing_mapper.rb~
 - lib/active_scaffold/extensions/unsaved_associated.rb~
 - lib/active_scaffold/extensions/active_association_reflection.rb~
 - lib/active_scaffold/paginator.rb