active_scaffold 3.0.12 → 3.0.21

data/lib/active_scaffold/actions/common_search.rb

@@ -4,7 +4,7 @@ module ActiveScaffold::Actions
     def store_search_params_into_session
       active_scaffold_session_storage[:search] = params.delete :search if params[:search]
     end
-
+    
     def search_params
       active_scaffold_session_storage[:search]
     end
@@ -12,7 +12,7 @@ module ActiveScaffold::Actions
     def search_ignore?
       active_scaffold_config.list.always_show_search
     end
-
+    
     # The default security delegates to ActiveRecordPermissions.
     # You may override the method to customize.
     def search_authorized?

data/lib/active_scaffold/actions/core.rb

@@ -6,6 +6,7 @@ module ActiveScaffold::Actions
       end
       base.helper_method :nested?
       base.helper_method :beginning_of_chain
+      base.helper_method :new_model
     end
     def render_field
       if params[:in_place_editing]
@@ -14,7 +15,7 @@ module ActiveScaffold::Actions
         render_field_for_update_columns
       end
     end
-
+    
     protected
 
     def nested?
@@ -31,10 +32,22 @@ module ActiveScaffold::Actions
       @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
+        if column.send_form_on_update_column
+          hash = if params[:scope]
+            hash = params[:scope].gsub('[','').split(']').inject(params[:record]) do |hash, index|
+              hash[index]
+            end
+          else
+            params[:record]
+          end
+          @record = update_record_from_params(@record, active_scaffold_config.update.columns, hash)
+        else
+          value = column_value_from_param_value(@record, column, params[:value])
+          @record.send "#{column.name}=", value
+        end
         after_render_field(@record, column)
-        render :partial => "render_field", :collection => Array(params[:update_columns]), :content_type => 'text/javascript'
+        source_id = params.delete(:source_id)
+        render :locals => {:source_id => source_id, :columns => column.update_columns, :scope => params[:scope]}
       end
     end
     
@@ -107,21 +120,21 @@ module ActiveScaffold::Actions
     # Override this method on your controller to define conditions to be used when querying a recordset (e.g. for List). The return of this method should be any format compatible with the :conditions clause of ActiveRecord::Base's find.
     def conditions_for_collection
     end
-
+  
     # Override this method on your controller to define joins to be used when querying a recordset (e.g. for List).  The return of this method should be any format compatible with the :joins clause of ActiveRecord::Base's find.
     def joins_for_collection
     end
-
+  
     # Override this method on your controller to provide custom finder options to the find() call. The return of this method should be a hash.
     def custom_finder_options
       {}
     end
-
+  
     #Overide this method on your controller to provide model with named scopes
     def beginning_of_chain
       active_scaffold_config.model
     end
-
+        
     # Builds search conditions by search params for column names. This allows urls like "contacts/list?company_id=5".
     def conditions_from_params
       conditions = nil
@@ -150,12 +163,20 @@ module ActiveScaffold::Actions
     private
     def respond_to_action(action)
       respond_to do |type|
-        send("#{action}_formats").each do |format|
+        action_formats.each do |format|
           type.send(format){ send("#{action}_respond_to_#{format}") }
         end
       end
     end
 
+    def action_formats
+      @action_formats ||= if respond_to? "#{action_name}_formats", true
+        send("#{action_name}_formats")
+      else
+        (default_formats + active_scaffold_config.formats).uniq
+      end
+    end
+
     def response_code_for_rescue(exception)
       case exception
         when ActiveScaffold::RecordNotAllowed

data/lib/active_scaffold/actions/create.rb

@@ -29,7 +29,7 @@ module ActiveScaffold::Actions
         return_to_main
       end
     end
-
+    
     def new_respond_to_js
       render(:partial => 'create_form')
     end
@@ -100,20 +100,24 @@ module ActiveScaffold::Actions
           @record = update_record_from_params(new_model, active_scaffold_config.create.columns, params[:record])
           apply_constraints_to_record(@record, :allow_autosave => true)
           if nested?
-            create_association_with_parent(@record)
+            create_association_with_parent(@record) 
             register_constraints_with_action_columns(nested.constrained_fields)
           end
-          before_create_save(@record)
-          self.successful = [@record.valid?, @record.associated_valid?].all? {|v| v == true} # this syntax avoids a short-circuit
-          if successful?
-            @record.save! and @record.save_associated!
-            after_create_save(@record)
-          end
+          create_save
         end
       rescue ActiveRecord::RecordInvalid
       end
     end
 
+    def create_save
+      before_create_save(@record)
+      self.successful = [@record.valid?, @record.associated_valid?].all? {|v| v == true} # this syntax avoids a short-circuit
+      if successful?
+        @record.save! and @record.save_associated!
+        after_create_save(@record)
+      end
+    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
 
@@ -122,11 +126,11 @@ module ActiveScaffold::Actions
 
     # The default security delegates to ActiveRecordPermissions.
     # You may override the method to customize.
-
+    
     def create_ignore?
       nested? && active_scaffold_config.list.always_show_create
     end
-
+    
     def create_authorized?
       (!nested? || !nested.readonly?) && authorized_for?(:crud_type => :create)
     end

data/lib/active_scaffold/actions/field_search.rb

@@ -11,24 +11,24 @@ module ActiveScaffold::Actions
     # FieldSearch uses params[:search] and not @record because search conditions do not always pass the Model's validations.
     # This facilitates for example, textual searches against associations via .search_sql
     def show_search
-      @record = active_scaffold_config.model.new
+      @record = new_model
       respond_to_action(:field_search)
     end
 
     protected
-
+    
     def store_search_params_into_session
       set_field_search_default_params(active_scaffold_config.field_search.default_params) unless active_scaffold_config.field_search.default_params.nil?
       super
       active_scaffold_session_storage[:search] = nil if search_params.is_a?(String)
     end
-
+    
     def set_field_search_default_params(default_params)
       if (params[:search].nil? && search_params.nil?) || (params[:search].is_a?(String) && params[:search].blank?)
         params[:search] = default_params.is_a?(Proc) ? self.instance_eval(&default_params) : default_params
       end
     end
-
+    
     def field_search_params
       search_params || {}
     end
@@ -36,7 +36,7 @@ module ActiveScaffold::Actions
     def field_search_respond_to_html
       render(:action => "field_search")
     end
-
+    
     def field_search_respond_to_js
       render(:partial => "field_search")
     end
@@ -70,7 +70,7 @@ module ActiveScaffold::Actions
     end
 
     private
-
+    
     def search_authorized_filter
       link = active_scaffold_config.field_search.link || active_scaffold_config.field_search.class.link
       raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method)

data/lib/active_scaffold/actions/list.rb

@@ -18,11 +18,11 @@ module ActiveScaffold::Actions
     def list
       do_list
       do_new if active_scaffold_config.list.always_show_create
-      @record ||= active_scaffold_config.model.new if active_scaffold_config.list.always_show_search
+      @record ||= new_model if active_scaffold_config.list.always_show_search
       @nested_auto_open = active_scaffold_config.list.nested_auto_open
       respond_to_action(:list)
     end
-
+    
     protected
     def list_respond_to_html
       if params.delete(:embedded)
@@ -65,14 +65,14 @@ module ActiveScaffold::Actions
       self.active_scaffold_includes.concat includes_for_list_columns
 
       options = { :sorting => active_scaffold_config.list.user.sorting,
-                  :count_includes => active_scaffold_config.list.user.count_includes }
+        :count_includes => active_scaffold_config.list.user.count_includes }
       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,
-          :page => active_scaffold_config.list.user.page,
-          :pagination => active_scaffold_config.list.pagination
-        })
+            :per_page => active_scaffold_config.list.user.per_page,
+            :page => active_scaffold_config.list.user.page,
+            :pagination => active_scaffold_config.list.pagination
+          })
       end
 
       page = find_page(options);
@@ -83,11 +83,19 @@ module ActiveScaffold::Actions
       @page, @records = page, page.items
     end
 
+    def each_record_in_page
+      _page = active_scaffold_config.list.user.page
+      do_search if respond_to? :do_search
+      active_scaffold_config.list.user.page = _page
+      do_list
+      @page.items.each {|record| yield record}
+    end
+
     def each_record_in_scope
       do_search if respond_to? :do_search
       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}
+        :conditions => all_conditions,
+        :joins => joins_for_finder}
       finder_options.merge! custom_finder_options
       finder_options.merge! :include => (active_scaffold_includes.blank? ? nil : active_scaffold_includes)
       klass = beginning_of_chain
@@ -107,14 +115,15 @@ module ActiveScaffold::Actions
     #   self.successful = true
     #   flash[:info] = 'Player fired'
     # end
-    def process_action_link_action(render_action = :action_update)
+    def process_action_link_action(render_action = :action_update, crud_type = nil)
       if request.get?
         # someone has disabled javascript, we have to show confirmation form first
         @record = find_if_allowed(params[:id], :read) if params[:id] && params[:id] && params[:id].to_i > 0
         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)
+          crud_type ||= (request.post? || request.put?) ? :update : :delete
+          @record = find_if_allowed(params[:id], crud_type)
           unless @record.nil?
             yield @record
           else
@@ -154,7 +163,7 @@ module ActiveScaffold::Actions
     def action_update_respond_to_yaml
       render :text => successful? ? "" : Hash.from_xml(response_object.to_xml(:only => list_columns_names)).to_yaml, :content_type => Mime::YAML, :status => response_status
     end
-
+     
     private
     def list_authorized_filter
       raise ActiveScaffold::ActionNotAllowed unless list_authorized?
@@ -163,6 +172,7 @@ module ActiveScaffold::Actions
     def list_formats
       (default_formats + active_scaffold_config.formats + active_scaffold_config.list.formats).uniq
     end
+    alias_method :index_formats, :list_formats
     alias_method :row_formats, :list_formats
 
     def action_update_formats

data/lib/active_scaffold/actions/mark.rb

@@ -8,43 +8,68 @@ module ActiveScaffold::Actions
     end
 
     def mark_all
-      if mark_all?
+      if mark_all? || mark_all_scope_forced?
         do_mark_all
       else
         do_demark_all
       end
+      respond_to_action(:mark_all)
+    end
+    protected
+
+    def mark_all_respond_to_html
       do_list
-      respond_to_action(:list)
+      list_respond_to_html
     end
- protected
 
+    def mark_all_respond_to_js
+      do_list
+      render :action => 'on_mark_all', :locals => {:mark_all => mark_all?}
+    end
+ 
     # We need to give the ActiveRecord classes a handle to currently marked records. We don't want to just pass the object,
     # 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 = marked_records
     end
-
+    
     def marked_records
       active_scaffold_session_storage[:marked_records] ||= Set.new
     end
-
+    
     def mark_all?
       @mark_all ||= [true, 'true', 1, '1', 'T', 't'].include?(params[:value].class == String ? params[:value].downcase : params[:value])
     end
 
+    def mark_all_scope_forced?
+      !params[:mark_target].nil? && params[:mark_target]=='scope'
+    end
+    
     def do_mark_all
-      each_record_in_scope {|record| marked_records << record.id}
+      if active_scaffold_config.mark.mark_all_mode == :page && !mark_all_scope_forced? then
+        each_record_in_page {|record| marked_records << record.id}
+      else
+        each_record_in_scope {|record| marked_records << record.id}
+      end
     end
 
     def do_demark_all
-      each_record_in_scope {|record| marked_records.delete(record.id)}
+      if active_scaffold_config.mark.mark_all_mode == :page then
+        each_record_in_page {|record| marked_records.delete(record.id)}
+      else
+        each_record_in_scope {|record| marked_records.delete(record.id)}
+      end
     end
-
+    
     # The default security delegates to ActiveRecordPermissions.
     # You may override the method to customize.
     def mark_authorized?
       authorized_for?(:action => :read)
     end
+
+    def mark_all_formats
+      (default_formats + active_scaffold_config.formats).uniq
+    end
   end
-end
+end

data/lib/active_scaffold/actions/nested.rb

@@ -1,9 +1,5 @@
 module ActiveScaffold::Actions
-  # The Nested module basically handles automatically linking
-  # controllers together. It does this by creating column links with
-  # the right parameters, and by providing any supporting systems
-  # (like a /:controller/nested action for returning associated
-  # scaffolds).
+  # The Nested module basically handles automatically linking controllers together. It does this by creating column links with the right parameters, and by providing any supporting systems (like a /:controller/nested action for returning associated scaffolds).
   module Nested
 
     def self.included(base)
@@ -23,16 +19,16 @@ module ActiveScaffold::Actions
     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)
+        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
-
+    
     def nested?
       !nested.nil?
     end
-
+    
     def set_nested
       if params[:parent_scaffold] && ((params[:association] && params[:assoc_id]) || params[:named_scope])
         @nested = nil
@@ -42,7 +38,7 @@ module ActiveScaffold::Actions
         params.delete_if {|key, value| [:parent_scaffold, :association, :named_scope, :assoc_id].include? key.to_sym}
       end
     end
-
+    
     def configure_nested
       if nested?
         active_scaffold_session_storage[:list][:label] =  if nested.belongs_to?
@@ -55,7 +51,7 @@ module ActiveScaffold::Actions
         end
       end
     end
-
+    
     def nested_authorized?(record = nil)
       true
     end
@@ -74,7 +70,7 @@ module ActiveScaffold::Actions
         else
           # Production mode is caching this link into a non nested scaffold
           active_scaffold_config.action_links.delete('new_existing') if active_scaffold_config.action_links['new_existing']
-
+          
           if active_scaffold_config.nested.shallow_delete
             active_scaffold_config.action_links.delete("destroy_existing") if active_scaffold_config.action_links['destroy_existing']
             if active_scaffold_config.actions.include?(:delete)
@@ -84,7 +80,7 @@ module ActiveScaffold::Actions
         end
       end
     end
-
+    
     def beginning_of_chain
       if nested? && nested.association && nested.association.collection?
         nested.parent_scope.send(nested.association.name)
@@ -98,7 +94,7 @@ module ActiveScaffold::Actions
     def nested_parent_record(crud = :read)
       @nested_parent_record ||= find_if_allowed(nested.parent_id, crud, nested.parent_model)
     end
-
+       
     def create_association_with_parent(record)
       if nested?
         if (nested.belongs_to? || nested.has_one? || nested.habtm?) && nested.child_association
@@ -114,7 +110,7 @@ module ActiveScaffold::Actions
         end
       end
     end
-
+    
     private
     def nested_formats
       (default_formats + active_scaffold_config.formats + active_scaffold_config.nested.formats).uniq
@@ -147,7 +143,7 @@ module ActiveScaffold::Actions::Nested
       do_destroy_existing
       respond_to_action(:destroy_existing)
     end
-
+    
     protected
     def new_existing_respond_to_html
       if successful?
@@ -210,7 +206,7 @@ module ActiveScaffold::Actions::Nested
     def delete_existing_authorized?(record = nil)
       true
     end
-
+ 
     def after_create_save(record)
       if params[:association_macro] == :has_and_belongs_to_many
         params[:associated_id] = record