active_scaffold 3.0.12 → 3.0.21

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -26,7 +26,7 @@ module ActiveScaffold
           when :select, :multi_select, :record_select
             associated = value
             associated = [associated].compact unless associated.is_a? Array
-            associated = column.association.klass.find(associated.map(&:to_i)).collect(&:to_label) if column.association
+            associated = column.association.klass.where(["id in (?)", associated.map(&:to_i)]).collect(&:to_label) if column.association
             "#{column.active_record_class.human_attribute_name(column.name)} = #{associated.join(', ')}"
           when :boolean, :checkbox
             label = column.column.type_cast(value) ? as_(:true) : as_(:false)

data/lib/active_scaffold/helpers/id_helpers.rb

@@ -86,7 +86,7 @@ module ActiveScaffold
         options[:action] ||= params[:action]
         clean_id "#{controller_id}-#{options[:action]}-#{options[:id]}-loading-indicator"
       end
-
+      
       def sub_section_id(options = {})
         options[:id] ||= params[:id]
         options[:id] ||= params[:parent_id]
@@ -98,7 +98,7 @@ module ActiveScaffold
         options[:id] ||= params[:parent_id]
         clean_id "#{controller_id}-#{options[:id]}-#{options[:association]}-subform"
       end
-
+      
       def sub_form_list_id(options = {})
         options[:id] ||= params[:id]
         options[:id] ||= params[:parent_id]

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -86,7 +86,7 @@ module ActiveScaffold
 
       def column_link_authorized?(link, column, record, associated)
         if column.association
-          associated_for_authorized = if associated.nil? || (associated.respond_to?(:empty?) && associated.empty?)
+          associated_for_authorized = if associated.nil? || (associated.respond_to?(:blank?) && associated.blank?)
             column.association.klass
           elsif [:has_many, :has_and_belongs_to_many].include? column.association.macro
             associated.first
@@ -136,13 +136,17 @@ module ActiveScaffold
         check_box(:record, column.name, options)
       end
 
-      def column_override(column)
-        "#{column.name.to_s.gsub('?', '')}_column" # parse out any question marks (see issue 227)
+      def column_override_name(column, class_prefix = false)
+        "#{clean_class_name(column.active_record_class.name) + '_' if class_prefix}#{clean_column_name(column.name)}_column"
       end
 
-      def column_override?(column)
-        respond_to?(column_override(column))
+      def column_override(column)
+        method_with_class = column_override_name(column, true)
+        return method_with_class if respond_to?(method_with_class)
+        method = column_override_name(column)
+        method if respond_to?(method)
       end
+      alias_method :column_override?, :column_override
 
       def override_column_ui?(list_ui)
         respond_to?(override_column_ui(list_ui))
@@ -208,7 +212,7 @@ module ActiveScaffold
             if column.associated_limit == 0
               size if column.associated_number?
             else
-              joined_associated = format_value(firsts.join(', '))
+              joined_associated = format_value(firsts.join(active_scaffold_config.list.association_join_text))
               joined_associated << " (#{size})" if column.associated_number? and column.associated_limit and value.size > column.associated_limit
               joined_associated
             end
@@ -247,7 +251,7 @@ module ActiveScaffold
       def inplace_edit?(record, column)
         if column.inplace_edit
           editable = controller.send(:update_authorized?, record) if controller.respond_to?(:update_authorized?)
-          editable = record.authorized_for?(:action => :update, :column => column.name) if editable.nil? || editable == true
+          editable = record.authorized_for?(:crud_type => :update, :column => column.name) if editable.nil? || editable == true
           editable
         end
       end
@@ -275,7 +279,7 @@ module ActiveScaffold
 
       def inplace_edit_control(column)
         if inplace_edit?(active_scaffold_config.model, column) and inplace_edit_cloning?(column)
-          @record = active_scaffold_config.model.new
+          @record = new_model
           column = column.clone
           column.options = column.options.clone
           column.form_ui = :select if (column.association && column.form_ui.nil?)
@@ -313,10 +317,17 @@ module ActiveScaffold
       end
 
       def mark_column_heading
-        all_marked = (marked_records.length >= @page.pager.count)
+        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
+        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(nil, !all_marked, all_marked), tag_options)
+        content_tag(:span, check_box_tag("#{controller_id}_mark_heading_span_input", !all_marked, all_marked), tag_options)
       end
 
       def render_column_heading(column, sorting, sort_direction)
@@ -342,19 +353,19 @@ module ActiveScaffold
           end
         end
       end
-
+      
       def render_nested_view(action_links, url_options, record)
         rendered = []
         action_links.member.each do |link|
-          if link.nested_link? && link.column && @nested_auto_open[link.column.name] && @records.length <= @nested_auto_open[link.column.name] && respond_to?(:render_component)
-            link_url_options = {:adapter => '_list_inline_adapter', :format => :js}.merge(action_link_url_options(link, url_options, record, options = {:reuse_eid => true}))
+          if link.nested_link? && link.column && @nested_auto_open[link.column.name] && @records.length <= @nested_auto_open[link.column.name] && controller.respond_to?(:render_component_into_view)
+            link_url_options = {:adapter => '_list_inline_adapter', :format => :js}.merge(action_link_url_options(link, url_options, record, options = {:reuse_eid => true})) 
             link_id = get_action_link_id(link_url_options, record, link.column)
-            rendered << (render_component(link_url_options) + javascript_tag("ActiveScaffold.ActionLink.get('#{link_id}').set_opened();"))
-          end
+            rendered << (controller.send(:render_component_into_view, link_url_options) + javascript_tag("ActiveScaffold.ActionLink.get('#{link_id}').set_opened();"))
+          end 
         end
         rendered.join(' ').html_safe
-      end
-
+      end  
+      
     end
   end
 end

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -59,7 +59,7 @@ module ActiveScaffold
         associated = options.delete :value
         associated = [associated].compact unless associated.is_a? Array
         associated.collect!(&:to_i)
-
+        
         if column.association
           select_options = options_for_association(column.association, false)
         else
@@ -86,7 +86,7 @@ module ActiveScaffold
         if html_options[:multiple]
           html_options[:name] += '[]'
         else
-          options[:include_blank] ||= as_(:_select_)
+          options[:include_blank] ||= as_(:_select_) 
         end
         select(:record, method, select_options, options, html_options)
       end
@@ -107,7 +107,7 @@ module ActiveScaffold
       end
       # we can't use checkbox ui because it's not possible to decide whether search for this field or not
       alias_method :active_scaffold_search_checkbox, :active_scaffold_search_boolean
-
+      
       def active_scaffold_search_null(column, options)
         select_options = []
         select_options << [as_(:_select_), nil]
@@ -118,18 +118,46 @@ module ActiveScaffold
       def field_search_params_range_values(column)
         values = field_search_params[column.name]
         return nil if values.nil?
-        return values[:opt], values[:from], values[:to]
+        return values[:opt], (values[:from].blank? ? nil : values[:from]), (values[:to].blank? ? nil : values[:to])
+        
       end
 
-      def active_scaffold_search_range(column, options)
-        opt_value, from_value, to_value = field_search_params_range_values(column)
+      def active_scaffold_search_range_string?(column)
+        (column.column && column.column.text?) || column.search_ui == :string
+      end
+
+      def include_null_comparators?(column)
+        return column.options[:null_comparators] if column.options.has_key? :null_comparators
+        if column.association
+          column.association.macro != :belongs_to || active_scaffold_config.columns[column.association.primary_key_name].column.try(:null)
+        else
+          column.column.try(:null)
+        end
+      end
 
-        text_field_size = 10
+      def active_scaffold_search_range_comparator_options(column)
         select_options = ActiveScaffold::Finder::NumericComparators.collect {|comp| [as_(comp.downcase.to_sym), comp]}
-        if column.column && column.column.text?
+        if active_scaffold_search_range_string?(column)
           select_options.unshift *ActiveScaffold::Finder::StringComparators.collect {|title, comp| [as_(title), comp]}
+        end
+        if include_null_comparators? column
+          select_options += ActiveScaffold::Finder::NullComparators.collect {|comp| [as_(comp), comp]}
+        end
+        select_options
+      end
+
+      def active_scaffold_search_range(column, options)
+        opt_value, from_value, to_value = field_search_params_range_values(column)
+
+        select_options = active_scaffold_search_range_comparator_options(column)
+        if active_scaffold_search_range_string?(column)
           text_field_size = 15
+          opt_value ||= '%?%'
+        else
+          text_field_size = 10
+          opt_value ||= '='
         end
+        
         from_value = controller.class.condition_value_for_numeric(column, from_value)
         to_value = controller.class.condition_value_for_numeric(column, to_value)
         from_value = format_number_value(from_value, column.options) if from_value.is_a?(Numeric)
@@ -142,44 +170,23 @@ module ActiveScaffold
         html << ' ' << content_tag(:span, (' - ' + text_field_tag("#{options[:name]}[to]", to_value,
               active_scaffold_input_text_options(:id => "#{options[:id]}_to", :size => text_field_size))).html_safe,
               :id => "#{options[:id]}_between", :class => "as_search_range_between", :style => "display:#{(opt_value == 'BETWEEN') ? '' : 'none'}")
-        html
+        content_tag :span, html, :class => 'search_range'
       end
       alias_method :active_scaffold_search_integer, :active_scaffold_search_range
       alias_method :active_scaffold_search_decimal, :active_scaffold_search_range
       alias_method :active_scaffold_search_float, :active_scaffold_search_range
       alias_method :active_scaffold_search_string, :active_scaffold_search_range
 
-      def active_scaffold_search_record_select(column, options)
-        value = field_search_record_select_value(column)
-        active_scaffold_record_select(column, options, value, column.options[:multiple])
-      end
-
-      def field_search_record_select_value(column)
-        begin
-          value = field_search_params[column.name]
-          unless value.blank?
-            if column.options[:multiple]
-              column.association.klass.find value.collect!(&:to_i)
-            else
-              column.association.klass.find(value.to_i)
-            end
-          end
-        rescue Exception => e
-          logger.error Time.now.to_s + "Sorry, we are not that smart yet. Attempted to restore search values to search fields but instead got -- #{e.inspect} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
-          raise e
-        end
-      end
-
       def field_search_datetime_value(value)
         DateTime.new(value[:year].to_i, value[:month].to_i, value[:day].to_i, value[:hour].to_i, value[:minute].to_i, value[:second].to_i) unless value.nil? || value[:year].blank?
       end
-
+      
       def active_scaffold_search_datetime(column, options)
         opt_value, from_value, to_value = field_search_params_range_values(column)
         options = column.options.merge(options)
         helper = "select_#{'date' unless options[:discard_date]}#{'time' unless options[:discard_time]}"
-
-        send(helper, field_search_datetime_value(from_value), {:include_blank => true, :prefix => "#{options[:name]}[from]"}.merge(options)) <<
+        
+        send(helper, field_search_datetime_value(from_value), {:include_blank => true, :prefix => "#{options[:name]}[from]"}.merge(options)) << 
         ' - '.html_safe << send(helper, field_search_datetime_value(to_value), {:include_blank => true, :prefix => "#{options[:name]}[to]"}.merge(options))
       end
 
@@ -195,13 +202,17 @@ module ActiveScaffold
       ## Search column override signatures
       ##
 
-      def override_search_field?(column)
-        respond_to?(override_search_field(column))
+      def override_search_field(column)
+        method_with_class = override_search_field_name(column, true)
+        return method_with_class if respond_to?(method_with_class)
+        method = override_search_field_name(column)
+        method if respond_to?(method)
       end
+      alias_method :override_search_field?, :override_search_field
 
       # the naming convention for overriding form fields with helpers
-      def override_search_field(column)
-        "#{column.name}_search_column"
+      def override_search_field_name(column, class_prefix = false)
+        "#{clean_class_name(column.active_record_class.name) + '_' if class_prefix}#{clean_column_name(column.name)}_search_column"
       end
 
       def override_search?(search_ui)
@@ -212,9 +223,9 @@ module ActiveScaffold
       def override_search(form_ui)
         "active_scaffold_search_#{form_ui}"
       end
-
+      
       def visibles_and_hiddens(search_config)
-        visibles = []
+        visibles = [] 
         hiddens = []
         search_config.columns.each do |column|
           next unless column.search_sql
@@ -226,7 +237,7 @@ module ActiveScaffold
         end
         return visibles, hiddens
       end
-
+      
       def searched_by?(column)
         value = field_search_params[column.name]
         case value

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

@@ -0,0 +1,215 @@
+module ActiveScaffold
+  module Helpers
+    # Helpers that assist with the rendering of a Form Column
+    module SearchColumnHelpers
+      # This method decides which input to use for the given column.
+      # It does not do any rendering. It only decides which method is responsible for rendering.
+      def active_scaffold_search_for(column)
+        options = active_scaffold_search_options(column)
+
+        # first, check if the dev has created an override for this specific field for search
+        if override_search_field?(column)
+          send(override_search_field(column), @record, options)
+
+        # second, check if the dev has specified a valid search_ui for this column, using specific ui for searches
+        elsif column.search_ui and override_search?(column.search_ui)
+          send(override_search(column.search_ui), column, options)
+
+        # third, check if the dev has specified a valid search_ui for this column, using generic ui for forms
+        elsif column.search_ui and override_input?(column.search_ui)
+          send(override_input(column.search_ui), column, options)
+
+        # fourth, check if the dev has created an override for this specific field
+        elsif override_form_field?(column)
+          send(override_form_field(column), @record, options)
+
+        # fallback: we get to make the decision
+        else
+          if column.association or column.virtual?
+            active_scaffold_search_text(column, options)
+
+          else # regular model attribute column
+            # if we (or someone else) have created a custom render option for the column type, use that
+            if override_search?(column.column.type)
+              send(override_search(column.column.type), column, options)
+            # if we (or someone else) have created a custom render option for the column type, use that
+            elsif override_input?(column.column.type)
+              send(override_input(column.column.type), column, options)
+            # final ultimate fallback: use rails' generic input method
+            else
+              # for textual fields we pass different options
+              text_types = [:text, :string, :integer, :float, :decimal]
+              options = active_scaffold_input_text_options(options) if text_types.include?(column.column.type)
+              input(:record, column.name, options.merge(column.options))
+            end
+          end
+        end
+      end
+
+      # the standard active scaffold options used for class, name and scope
+      def active_scaffold_search_options(column)
+        { :name => "search[#{column.name}]", :class => "#{column.name}-input", :id => "search_#{column.name}", :value => field_search_params[column.name] }
+      end
+
+      ##
+      ## Search input methods
+      ##
+
+      def active_scaffold_search_multi_select(column, options)
+        associated = options.delete :value
+        associated = [associated].compact unless associated.is_a? Array
+        associated.collect!(&:to_i)
+        select_options = options_for_association(column.association, true)
+        return as_(:no_options) if select_options.empty?
+
+        html = "<ul class=\"checkbox-list\" id=\"#{options[:id]}\">"
+
+        options[:name] += '[]'
+        select_options.each_with_index do |option, i|
+          label, id = option
+          this_id = "#{options[:id]}_#{i}_id"
+          html << "<li>"
+          html << check_box_tag(options[:name], id, associated.include?(id), :id => this_id)
+          html << "<label for='#{this_id}'>"
+          html << label
+          html << "</label>"
+          html << "</li>"
+        end
+
+        html << '</ul>'
+        html << javascript_tag("new DraggableLists('#{options[:id]}')") if column.options[:draggable_lists]
+        html
+      end
+
+      def active_scaffold_search_select(column, html_options)
+        associated = html_options.delete :value
+        if column.association
+          associated = associated.is_a?(Array) ? associated.map(&:to_i) : associated.to_i unless associated.nil?
+          method = column.association.macro == :belongs_to ? column.association.primary_key_name : column.name
+          options_for_select = options_for_association(column.association, true)
+        else
+          method = column.name
+          options_for_select = active_scaffold_translated_options(column)
+        end
+
+        options = { :selected => associated }.merge! column.options
+        html_options.merge! column.options[:html_options] || {}
+        if html_options[:multiple]
+          html_options[:name] += '[]'
+        else
+          options[:include_blank] ||= as_(:_select_) 
+        end
+        select(:record, method, options_for_select, options, html_options)
+      end
+
+      def active_scaffold_search_text(column, options)
+        text_field :record, column.name, active_scaffold_input_text_options(options)
+      end
+
+      # we can't use active_scaffold_input_boolean because we need to have a nil value even when column can't be null
+      # to decide whether search for this field or not
+      def active_scaffold_search_boolean(column, options)
+        select_options = []
+        select_options << [as_(:_select_), nil]
+        select_options << [as_(:true), true]
+        select_options << [as_(:false), false]
+
+        select_tag(options[:name], options_for_select(select_options, column.column.type_cast(field_search_params[column.name])))
+      end
+      # we can't use checkbox ui because it's not possible to decide whether search for this field or not
+      alias_method :active_scaffold_search_checkbox, :active_scaffold_search_boolean
+
+      def field_search_params_range_values(column)
+        values = field_search_params[column.name]
+        return nil if values.nil?
+        return values[:opt], values[:from], values[:to]
+      end
+
+      def include_null_comparators?(column)
+        return column.options[:null_comparators] if column.options.has_key? :null_comparators
+        if column.association
+          column.association.macro != :belongs_to || active_scaffold_config.columns[column.association.primary_key_name].column.try(:null)
+        else
+          column.column.try(:null)
+        end
+      end
+
+      def active_scaffold_search_range(column, options)
+        opt_value, from_value, to_value = field_search_params_range_values(column)
+        select_options = ActiveScaffold::Finder::NumericComparators.collect {|comp| [as_(comp.downcase.to_sym), comp]}
+        select_options.unshift *ActiveScaffold::Finder::StringComparators.collect {|title, comp| [as_(title), comp]} if column.options[:string_comparators] || column.column.try(:text?)
+        select_options += ActiveScaffold::Finder::NullComparators.collect {|comp| [as_(comp.downcase.to_sym), comp]} if include_null_comparators? column
+
+        html = []
+        html << select_tag("#{options[:name]}[opt]",
+              options_for_select(select_options, opt_value),
+              :id => "#{options[:id]}_opt",
+              :onchange => "Element[this.value == 'BETWEEN' ? 'show' : 'hide']('#{options[:id]}_between');")
+        html << text_field_tag("#{options[:name]}[from]", from_value, active_scaffold_input_text_options(:id => options[:id], :size => 10))
+        html << content_tag(:span, ' - ' + text_field_tag("#{options[:name]}[to]", to_value,
+              active_scaffold_input_text_options(:id => "#{options[:id]}_to", :size => 10)),
+              :id => "#{options[:id]}_between", :style => "display:none")
+        html * ' '
+      end
+      alias_method :active_scaffold_search_integer, :active_scaffold_search_range
+      alias_method :active_scaffold_search_decimal, :active_scaffold_search_range
+      alias_method :active_scaffold_search_float, :active_scaffold_search_range
+      alias_method :active_scaffold_search_string, :active_scaffold_search_range
+
+      def field_search_datetime_value(value)
+        DateTime.new(value[:year].to_i, value[:month].to_i, value[:day].to_i, value[:hour].to_i, value[:minute].to_i, value[:second].to_i) unless value.nil? || value[:year].blank?
+      end
+      
+      def active_scaffold_search_datetime(column, options)
+        opt_value, from_value, to_value = field_search_params_range_values(column)
+        options = column.options.merge(options)
+        helper = "select_#{'date' unless options[:discard_date]}#{'time' unless options[:discard_time]}"
+        html = []
+        html << send(helper, field_search_datetime_value(from_value), {:include_blank => true, :prefix => "#{options[:name]}[from]"}.merge(options))
+        html << send(helper, field_search_datetime_value(to_value), {:include_blank => true, :prefix => "#{options[:name]}[to]"}.merge(options))
+        html * ' - '
+      end
+
+      def active_scaffold_search_date(column, options)
+        active_scaffold_search_datetime(column, options.merge!(:discard_time => true))
+      end
+      def active_scaffold_search_time(column, options)
+        active_scaffold_search_datetime(column, options.merge!(:discard_date => true))
+      end
+      alias_method :active_scaffold_search_timestamp, :active_scaffold_search_datetime
+
+      ##
+      ## Search column override signatures
+      ##
+
+      def override_search_field(column)
+        method = override_search_field_name(column)
+        return method if respond_to?(method)
+        old_method = override_search_field_name(column, true)
+        if respond_to?(old_method)
+          ActiveSupport::Deprecation.warn("You are using an old naming schema for overrides, you should name the helper #{method} instead of #{old_method}")
+          old_method
+        end
+        method_with_class = override_search_field_name(column, true)
+        return method_with_class if respond_to?(method_with_class)
+        method = override_form_field_name(column)
+        method if respond_to?(method)
+      end
+      alias_method :override_search_field?, :override_search_field
+
+      # the naming convention for overriding form fields with helpers
+      def override_search_field_name(column, class_prefix = false)
+        "#{clean_class_name(column.active_record_class.name) + '_' if class_prefix}#{clean_column_name(column.name)}_search_column"
+      end
+
+      def override_search?(search_ui)
+        respond_to?(override_search(search_ui))
+      end
+
+      # the naming convention for overriding search input types with helpers
+      def override_search(form_ui)
+        "active_scaffold_search_#{form_ui}"
+      end
+    end
+  end
+end