active_scaffold 3.2.11 → 3.2.12

data/lib/active_scaffold/actions/nested.rb

@@ -76,13 +76,15 @@ module ActiveScaffold::Actions
       if nested? && nested.association && !nested.association.belongs_to?
         if nested.association.collection?
           nested.parent_scope.send(nested.association.name)
+        elsif nested.association.options[:through] # has_one :through doesn't need conditions
+          active_scaffold_config.model
         elsif nested.child_association.belongs_to?
           active_scaffold_config.model.where(nested.child_association.foreign_key => nested.parent_scope)
         end
       elsif nested? && nested.scope
         nested.parent_scope.send(nested.scope)
       else
-        super
+        active_scaffold_config.model
       end
     end
 

data/lib/active_scaffold/actions/subform.rb

@@ -9,13 +9,13 @@ module ActiveScaffold::Actions
 
     def do_edit_associated
       @parent_record = params[:id].nil? ? new_model : find_if_allowed(params[:id], :update)
-      @column = active_scaffold_config.columns[params[:association]]
+      @column = active_scaffold_config.columns[params[:child_association]]
 
       # NOTE: we don't check whether the user is allowed to update this record, because if not, we'll still let them associate the record. we'll just refuse to do more than associate, is all.
       @record = @column.association.klass.find(params[:associated_id]) if params[:associated_id]
       @record ||= build_associated(@column, @parent_record)
 
-      @scope = "[#{@column.name}]"
+      @scope = "#{params[:scope]}[#{@column.name}]"
       @scope += (@record.new_record?) ? "[#{(Time.now.to_f*1000).to_i.to_s}]" : "[#{@record.id}]" if @column.plural_association?
     end
 

data/lib/active_scaffold/config/core.rb

@@ -60,6 +60,14 @@ module ActiveScaffold::Config
     cattr_accessor :sti_create_links
     @@sti_create_links = true
 
+    # prefix messages with current timestamp, set the format to display (you can use I18n keys) or true and :short will be used
+    cattr_accessor :timestamped_messages
+    @@timestamped_messages = false
+
+    # a hash of string (or array of strings) and highlighter string to highlight words in messages. It will use highlight rails helper
+    cattr_accessor :highlight_messages
+    @@highlight_messages = nil
+
     # instance-level configuration
     # ----------------------------
 
@@ -101,6 +109,12 @@ module ActiveScaffold::Config
     # STI children models, use an array of model names
     attr_accessor :sti_children
 
+    # prefix messages with current timestamp, set the format to display (you can use I18n keys) or true and :short will be used
+    attr_accessor :timestamped_messages
+
+    # a hash of string (or array of strings) and highlighter string to highlight words in messages. It will use highlight rails helper
+    attr_accessor :highlight_messages
+
     ##
     ## internal usage only below this point
     ## ------------------------------------
@@ -129,11 +143,13 @@ module ActiveScaffold::Config
 
       # inherit from the global set of action links
       @action_links = self.class.action_links.clone
+      @timestamped_messages = self.class.timestamped_messages
+      @highlight_messages = self.class.highlight_messages
     end
 
     # To be called after your finished configuration
     def _load_action_columns
-      ActiveScaffold::DataStructures::ActionColumns.class_eval {include ActiveScaffold::DataStructures::ActionColumns::AfterConfiguration}
+      #ActiveScaffold::DataStructures::ActionColumns.class_eval {include ActiveScaffold::DataStructures::ActionColumns::AfterConfiguration}
 
       # then, register the column objects
       self.actions.each do |action_name|

data/lib/active_scaffold/config/form.rb

@@ -47,7 +47,7 @@ module ActiveScaffold::Config
     def columns
       unless @columns # lazy evaluation
         self.columns = @core.columns._inheritable
-        self.columns.exclude :created_on, :created_at, :updated_on, :updated_at, :marked
+        self.columns.exclude :created_on, :created_at, :updated_on, :updated_at, :as_marked
         self.columns.exclude *@core.columns.collect{|c| c.name if c.polymorphic_association?}.compact
       end
       @columns

data/lib/active_scaffold/config/list.rb

@@ -20,7 +20,6 @@ module ActiveScaffold::Config
       @pagination = self.class.pagination
       @show_search_reset = self.class.show_search_reset
       @reset_link = self.class.reset_link.clone
-      @mark_records = self.class.mark_records
       @wrap_tag = self.class.wrap_tag
       @always_show_search = self.class.always_show_search
       @always_show_create = self.class.always_show_create
@@ -62,10 +61,6 @@ module ActiveScaffold::Config
     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
-    @@mark_records = false
-
     # show a link to reset the search next to filtered message
     cattr_accessor :show_search_reset
     @@show_search_reset = true
@@ -130,9 +125,6 @@ module ActiveScaffold::Config
     # the ActionLink to reset search
     attr_reader :reset_link
 
-    # 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

data/lib/active_scaffold/config/mark.rb

@@ -13,23 +13,18 @@ module ActiveScaffold::Config
     def initialize(core_config)
       @core = core_config
       @mark_all_mode = self.class.mark_all_mode
-      if core_config.actions.include?(:update)
-        @core.model.send(:include, ActiveScaffold::MarkedModel) unless @core.model.ancestors.include?(ActiveScaffold::MarkedModel)
-        add_mark_column
-      else
-        raise "Mark action requires update action in controller for model: #{core_config.model.to_s}"
-      end
+      @core.model.send(:include, ActiveScaffold::MarkedModel) unless @core.model < ActiveScaffold::MarkedModel
+      add_mark_column
     end
     
     protected
     
     def add_mark_column
-      @core.columns.add :marked
-      @core.columns[:marked].label = 'M'
-      @core.columns[:marked].form_ui = :checkbox
-      @core.columns[:marked].inplace_edit = true
-      @core.columns[:marked].sort = false
-      @core.list.columns = [:marked] + @core.list.columns.names_without_auth_check unless @core.list.columns.include? :marked
+      @core.columns.add :as_marked
+      @core.columns[:as_marked].label = 'M'
+      @core.columns[:as_marked].list_ui = :marked
+      @core.columns[:as_marked].sort = false
+      @core.list.columns = [:as_marked] + @core.list.columns.names_without_auth_check unless @core.list.columns.include? :as_marked
     end
   end
 end

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -38,27 +38,20 @@ module ActiveScaffold::DataStructures
     end
 
     def names
-      self.collect(&:name)
+      if @columns
+        self.collect(&:name)
+      else
+        names_without_auth_check
+      end
     end
 
     def names_without_auth_check
       Array(@set)
     end
 
-    protected
-
-    def collect_columns
-      @set.collect {|col| col.is_a?(ActiveScaffold::DataStructures::ActionColumns) ? col.collect_columns : col}
-    end
-
-    # called during clone or dup. makes the clone/dup deeper.
-    def initialize_copy(from)
-      @set = from.instance_variable_get('@set').clone
-    end
-
     # A package of stuff to add after the configuration block. This is an attempt at making a certain level of functionality inaccessible during configuration, to reduce possible breakage from misuse.
     # The bulk of the package is a means of connecting the referential column set (ActionColumns) with the actual column objects (Columns). This lets us iterate over the set and yield real column objects.
-    module AfterConfiguration
+    #module AfterConfiguration
       # Redefine the each method to yield actual Column objects.
       # It will skip constrained and unauthorized columns.
       #
@@ -66,10 +59,10 @@ module ActiveScaffold::DataStructures
       #  * :flatten - whether to recursively iterate on nested sets. default is false.
       #  * :for - the record (or class) being iterated over. used for column-level security. default is the class.
       def each(options = {}, &proc)
-        options[:for] ||= @columns.active_record_class
+        options[:for] ||= @columns.active_record_class unless @columns.nil?
         self.unauthorized_columns = []
         @set.each do |item|
-          unless item.is_a? ActiveScaffold::DataStructures::ActionColumns
+          unless item.is_a?(ActiveScaffold::DataStructures::ActionColumns) || @columns.nil?
             item = (@columns[item] || ActiveScaffold::DataStructures::Column.new(item.to_sym, @columns.active_record_class))
             next if self.skip_column?(item, options)
           end
@@ -133,6 +126,17 @@ module ActiveScaffold::DataStructures
       def length
         ((@set - self.constraint_columns) - self.unauthorized_columns).length
       end
+    #end
+
+    protected
+
+    def collect_columns
+      @set.collect {|col| col.is_a?(ActiveScaffold::DataStructures::ActionColumns) ? col.collect_columns : col}
+    end
+
+    # called during clone or dup. makes the clone/dup deeper.
+    def initialize_copy(from)
+      @set = from.instance_variable_get('@set').clone
     end
   end
 end

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -38,13 +38,17 @@ module ActiveScaffold::DataStructures
     end
     
     def parent_scope
-      parent_model.find(parent_id)
+      @parent_scope ||= parent_model.find(parent_id)
     end
     
     def habtm?
       false 
     end
-    
+
+    def has_many?
+      false
+    end
+
     def belongs_to?
       false
     end
@@ -52,6 +56,18 @@ module ActiveScaffold::DataStructures
     def has_one?
       false
     end
+
+    def singular_association?
+      belongs_to? || has_one?
+    end
+
+    def plural_association?
+      has_many? || habtm?
+    end
+
+    def through_association?
+      false
+    end
     
     def readonly?
       false
@@ -73,6 +89,10 @@ module ActiveScaffold::DataStructures
       self.association.name
     end
     
+    def has_many?
+      association.macro == :has_many 
+    end
+    
     def habtm?
       association.macro == :has_and_belongs_to_many 
     end
@@ -85,12 +105,12 @@ module ActiveScaffold::DataStructures
       association.macro == :has_one
     end
     
+    def through_association?
+      association.options[:through]
+    end
+    
     def readonly?
-      if association.options.has_key? :readonly
-        association.options[:readonly]
-      else
-        association.options.has_key? :through
-      end
+      association.options[:readonly]
     end
 
     def sorted?

data/lib/active_scaffold/extensions/routing_mapper.rb

@@ -1,8 +1,8 @@
 module ActionDispatch
   module Routing
     ACTIVE_SCAFFOLD_CORE_ROUTING = {
-        :collection => {:show_search => :get, :render_field => :get},
-        :member => {:row => :get, :update_column => :post, :render_field => :get}
+        :collection => {:show_search => :get, :render_field => :get, :mark => :post},
+        :member => {:row => :get, :update_column => :post, :render_field => :get, :mark => :post}
     }
     ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING = {
         :collection => {:edit_associated => :get, :new_existing => :get, :add_existing => :post},

data/lib/active_scaffold/finder.rb

@@ -281,13 +281,19 @@ module ActiveScaffold
       finder_options
     end
 
-    # Returns a hash with options to count records, rejecting select and order options
-    # See finder_options for valid options
-    def count_options(find_options = {}, count_includes = nil)
+    def count_items(find_options = {}, count_includes = nil)
       count_includes ||= find_options[:includes] unless find_options[:conditions].nil?
       options = find_options.reject{|k,v| [:select, :reorder].include? k}
       options[:includes] = count_includes
-      options
+      
+      # NOTE: we must use :include in the count query, because some conditions may reference other tables
+      count_query = append_to_query(beginning_of_chain, options)
+      count = count_query.count
+  
+      # Converts count to an integer if ActiveRecord returned an OrderedHash
+      # that happens when find_options contains a :group key
+      count = count.length if count.is_a? ActiveSupport::OrderedHash
+      count
     end
 
     # returns a Paginator::Page (not from ActiveRecord::Paginator) for the given parameters
@@ -298,18 +304,13 @@ module ActiveScaffold
       options[:page] ||= 1
 
       find_options = finder_options(options)
-      klass = beginning_of_chain
       
       # NOTE: we must use :include in the count query, because some conditions may reference other tables
       if options[:pagination] && options[:pagination] != :infinite
-        count_query = append_to_query(klass, count_options(find_options, options[:count_includes]))
-        count = count_query.count unless options[:pagination] == :infinite
+        count = count_items(find_options, options[:count_includes])
       end
-  
-      # Converts count to an integer if ActiveRecord returned an OrderedHash
-      # that happens when find_options contains a :group key
-      count = count.length if count.is_a? ActiveSupport::OrderedHash
 
+      klass = beginning_of_chain
       # we build the paginator differently for method- and sql-based sorting
       if options[:sorting] and options[:sorting].sorts_by_method?
         pager = ::Paginator.new(count, options[:per_page]) do |offset, per_page|

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -2,10 +2,14 @@ module ActiveScaffold
   module Helpers
     module ControllerHelpers
       def self.included(controller)
-        controller.class_eval { helper_method :params_for, :main_path_to_return, :render_parent?, :render_parent_options, :render_parent_action, :nested_singular_association?, :build_associated}
+        controller.class_eval { helper_method :params_for, :params_conditions, :main_path_to_return, :render_parent?, :render_parent_options, :render_parent_action, :nested_singular_association?, :build_associated}
       end
       
       include ActiveScaffold::Helpers::IdHelpers
+
+      def params_conditions
+        conditions_from_params.keys
+      end
       
       def params_for(options = {})
         # :adapter and :position are one-use rendering arguments. they should not propagate.
@@ -81,14 +85,6 @@ module ActiveScaffold
         end if @parent_action.nil?
         @parent_action
       end
-
-      def render_parent_controller
-        if nested_singular_association?
-          nested.parent_scaffold.controller_path
-        else
-          params[:parent_sti]
-        end
-      end
       
       def build_associated(column, record)
         if column.singular_association?

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -278,11 +278,11 @@ module ActiveScaffold
         end
       end
 
-      def column_scope(column)
+      def column_scope(column, scope = nil)
         if column.plural_association?
-          "[#{column.name}][#{@record.id || generate_temporary_id}]"
+          "#{scope}[#{column.name}][#{@record.id || generate_temporary_id}]"
         else
-          "[#{column.name}]"
+          "#{scope}[#{column.name}]"
         end
       end
 

data/lib/active_scaffold/helpers/id_helpers.rb

@@ -6,10 +6,14 @@ module ActiveScaffold
         controller.to_s.gsub("/", "__").html_safe
       end
 
-      def controller_id(controller = (params[:eid] || params[:parent_controller] || params[:controller]))
+      def controller_id(controller = (params[:eid] || nested_id || params[:parent_controller] || params[:controller]))
         controller_id ||= 'as_' + id_from_controller(controller)
       end
 
+      def nested_id
+        "#{nested.parent_scaffold.controller_path}-#{nested.parent_id}-#{params[:controller]}" if nested?
+      end
+
       def active_scaffold_id
         "#{controller_id}-active-scaffold"
       end

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -92,10 +92,11 @@ module ActiveScaffold
 
       def column_link_authorized?(link, column, record, associated)
         if column.association
-          associated_for_authorized = if associated.nil? || (associated.respond_to?(:blank?) && associated.blank?)
+          associated_for_authorized = if associated.nil? || (column.plural_association? && !associated.loaded?) || (associated.respond_to?(:blank?) && associated.blank?)
             column.association.klass
           elsif [:has_many, :has_and_belongs_to_many].include? column.association.macro
-            associated.first
+            # may be cached with [] or [nil] to avoid some queries
+            associated.first || column.association.klass
           else
             associated
           end
@@ -125,6 +126,11 @@ module ActiveScaffold
         clean_column_value(truncate(record.send(column.name), :length => column.options[:truncate] || 50))
       end
 
+      def active_scaffold_column_marked(column, record)
+        options = {:id => nil, :object => record}
+        content_tag(:span, check_box(:record, column.name, options), :class => 'in_place_editor_field', :data => {:ie_id => record.id.to_s})
+      end
+
       def active_scaffold_column_checkbox(column, record)
         options = {:disabled => true, :id => nil, :object => record}
         options.delete(:disabled) if inplace_edit?(record, column)
@@ -150,7 +156,7 @@ module ActiveScaffold
         value ||= record.send(column.name) unless record.nil?
         if value && column.association # cache association size before calling column_empty?
           associated_size = value.size if column.plural_association? and column.associated_number? # get count before cache association
-          cache_association(value, column) if column.plural_association?
+          cache_association(value, column, associated_size) if column.plural_association?
         end
         if column.association.nil? or column_empty?(value)
           if column.form_ui == :select && column.options[:options]
@@ -222,14 +228,16 @@ module ActiveScaffold
         clean_column_value(value)
       end
 
-      def cache_association(value, column)
+      def cache_association(value, column, size)
         # we are not using eager loading, cache firsts records in order not to query the database in a future
         unless value.loaded?
-          # load at least one record, is needed for column_empty? and checking permissions
+          # load at least one record, is needed to display '...'
           if column.associated_limit.nil?
             Rails.logger.warn "ActiveScaffold: Enable eager loading for #{column.name} association to reduce SQL queries"
-          else
+          elsif column.associated_limit > 0
             value.target = value.find(:all, :limit => column.associated_limit + 1, :select => column.select_columns)
+          else
+            value.target = size.to_i.zero? ? [] : [nil]
           end
         end
       end
@@ -254,9 +262,9 @@ module ActiveScaffold
         formatted_column = options[:formatted_column] || format_column_value(record, column)
         id_options = {:id => record.id.to_s, :action => 'update_column', :name => column.name.to_s}
         tag_options = {:id => element_cell_id(id_options), :class => "in_place_editor_field",
-                       :title => as_(:click_to_edit), 'data-ie_id' => record.id.to_s}
+                       :title => as_(:click_to_edit), :data => {:ie_id => record.id.to_s}}
 
-        content_tag(:span, as_(:click_to_edit), :class => 'handle') <<
+        content_tag(:span, as_(:inplace_edit_handle), :class => 'handle') <<
         content_tag(:span, formatted_column, tag_options)
       end
 
@@ -276,54 +284,65 @@ module ActiveScaffold
         "as_inplace_pattern"
       end
 
-      def inplace_edit_tag_attributes(column)
-        tag_options = {}
-        tag_options['data-ie_url'] = url_for({:controller => params_for[:controller], :action => "update_column", :column => column.name, :id => '__id__'})
-        tag_options['data-ie_cancel_text'] = column.options[:cancel_text] || as_(:cancel)
-        tag_options['data-ie_loading_text'] = column.options[:loading_text] || as_(:loading)
-        tag_options['data-ie_save_text'] = column.options[:save_text] || as_(:update)
-        tag_options['data-ie_saving_text'] = column.options[:saving_text] || as_(:saving)
-        tag_options['data-ie_rows'] = column.options[:rows] || 5 if column.column.try(:type) == :text
-        tag_options['data-ie_cols'] = column.options[:cols] if column.options[:cols]
-        tag_options['data-ie_size'] = column.options[:size] if column.options[:size]
+      def inplace_edit_data(column)
+        data = {}
+        data[:ie_url] = url_for({:controller => params_for[:controller], :action => "update_column", :column => column.name, :id => '__id__'})
+        data[:ie_cancel_text] = column.options[:cancel_text] || as_(:cancel)
+        data[:ie_loading_text] = column.options[:loading_text] || as_(:loading)
+        data[:ie_save_text] = column.options[:save_text] || as_(:update)
+        data[:ie_saving_text] = column.options[:saving_text] || as_(:saving)
+        data[:ie_rows] = column.options[:rows] || 5 if column.column.try(:type) == :text
+        data[:ie_cols] = column.options[:cols] if column.options[:cols]
+        data[:ie_size] = column.options[:size] if column.options[:size]
 
         if column.list_ui == :checkbox
-          tag_options['data-ie_mode'] = :inline_checkbox
+          data[:ie_mode] = :inline_checkbox
         elsif inplace_edit_cloning?(column)
-          tag_options['data-ie_mode'] = :clone
+          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)
           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
-          tag_options['data-ie_plural'] = plural
+          data[:ie_render_url] = url
+          data[:ie_mode] = :ajax
+          data[:ie_plural] = plural
         end
-        tag_options
+        data
       end
 
-      def mark_column_heading
-        if active_scaffold_config.mark.mark_all_mode == :page then
-          all_marked = true
-          @page.items.each do |record|
-            all_marked = false if !marked_records.entries.include?(record.id)
-          end
+      def all_marked?
+        if active_scaffold_config.mark.mark_all_mode == :page
+          all_marked = @page.items.detect { |record| !marked_records.include?(record.id) }.nil?
         else
           all_marked = (marked_records.length >= @page.pager.count)
         end
-        tag_options = {:id => "#{controller_id}_mark_heading", :class => "mark_heading in_place_editor_field"}
-        tag_options['data-ie_url'] = url_for({:controller => params_for[:controller], :action => 'mark_all', :eid => params[:eid]})
-        content_tag(:span, check_box_tag("#{controller_id}_mark_heading_span_input", !all_marked, all_marked), tag_options)
+      end
+
+      def mark_column_heading
+        tag_options = {
+          :id => "#{controller_id}_mark_heading",
+          :class => "mark_heading in_place_editor_field",
+        }
+        content_tag(:span, check_box_tag("#{controller_id}_mark_heading_span_input", '1', all_marked?), tag_options)
       end
 
       def render_column_heading(column, sorting, sort_direction)
         tag_options = {:id => active_scaffold_column_header_id(column), :class => column_heading_class(column, sorting), :title => column.description}
-        tag_options.merge!(inplace_edit_tag_attributes(column)) if column.inplace_edit
+        if column.name == :as_marked
+          tag_options[:data] = {
+            :ie_mode => :inline_checkbox,
+            :ie_url => url_for(:controller => params_for[:controller], :action => 'mark', :id => '__id__', :eid => params[:eid])
+          }
+        else
+          tag_options[:data] = inplace_edit_data(column) if column.inplace_edit
+        end
         content_tag(:th, column_heading_value(column, sorting, sort_direction) + inplace_edit_control(column), tag_options)
       end
 
 
       def column_heading_value(column, sorting, sort_direction)
-        if column.sortable?
+        if column.name == :as_marked
+          mark_column_heading
+        elsif column.sortable?
           options = {:id => nil, :class => "as_sort",
                      'data-page-history' => controller_id,
                      :remote => true, :method => :get}
@@ -331,11 +350,7 @@ module ActiveScaffold
                            :sort => column.name, :sort_direction => sort_direction)
           link_to column.label, url_options, options
         else
-          if column.name != :marked
-            content_tag(:p, column.label)
-          else
-            mark_column_heading
-          end
+          content_tag(:p, column.label)
         end
       end