active_scaffold 3.4.17 → 3.4.18

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -2,49 +2,76 @@ module ActiveScaffold
   module Helpers
     # Helpers that assist with rendering of a human readable search statement
     module HumanConditionHelpers
-
       def active_scaffold_human_condition_for(column)
-        value = field_search_params[column.name]
+        return if (value = field_search_params[column.name]).nil?
         search_ui = column.search_ui
         search_ui ||= column.column.type if column.column
         if override_human_condition_column?(column)
           send(override_human_condition_column(column), value, {})
-        elsif search_ui and override_human_condition?(column.search_ui)
-          send(override_human_condition(column.search_ui), column, value)
+        elsif search_ui && override_human_condition?(search_ui)
+          send(override_human_condition(search_ui), column, value)
         else
-          case search_ui
-          when :integer, :decimal, :float
-            "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt].downcase).downcase} #{format_number_value(controller.class.condition_value_for_numeric(column, value[:from]), column.options) if value[:from].present?} #{value[:opt] == 'BETWEEN' ? '- ' + format_number_value(controller.class.condition_value_for_numeric(column, value[:to]), column.options).to_s : ''}"
-          when :string
-            opt = ActiveScaffold::Finder::StringComparators.index(value[:opt]) || value[:opt]
-            "#{column.active_record_class.human_attribute_name(column.name)} #{as_(opt).downcase} '#{value[:from]}' #{opt == 'BETWEEN' ? '- ' + value[:to].to_s : ''}"
-          when :date, :time, :datetime, :timestamp
-            conversion = column.column.type == :date ? :to_date : :to_time
-            from = controller.condition_value_for_datetime(column, value[:from], conversion)
-            to = controller.condition_value_for_datetime(column, value[:to], conversion)
-            "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt])} #{I18n.l(from)} #{value[:opt] == 'BETWEEN' ? '- ' + I18n.l(to) : ''}"
-          when :select, :multi_select, :record_select
-            associated = value
-            associated = [associated].compact unless associated.is_a? Array
-            if column.association
-              method = column.options[:label_method] || :to_label
-              associated = column.association.klass.where(:id => associated.map(&:to_i)).collect(&method)
-            elsif column.options[:options]
-              associated = associated.collect do |value|
-                text, val = column.options[:options].find {|text, val| (val.nil? ? text : val).to_s == value.to_s}
-                value = active_scaffold_translated_option(column, text, val).first if text
-                value
-              end
-            end
-            as_(:association, :scope => :human_conditions, :column => column.active_record_class.human_attribute_name(column.name), :value => associated.join(', '))
-          when :boolean, :checkbox
-            label = ActiveScaffold::Core.column_type_cast(value, column.column) ? as_(:true) : as_(:false)
-            as_(:boolean, :scope => :human_conditions, :column => column.active_record_class.human_attribute_name(column.name), :value => label)
-          when :null
-            "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value.to_sym)}"
+          logger.warn "undefined active_scaffold_human_condition method for search_ui #{search_ui} on column #{column.name}"
+        end
+      end
+
+      def format_human_condition(column, opt, from = nil, to = nil)
+        attribute = column.active_record_class.human_attribute_name(column.name)
+        "#{attribute} #{as_(opt).downcase} #{from} #{to}"
+      end
+
+      def active_scaffold_human_condition_integer(column, value)
+        from = format_number_value(controller.class.condition_value_for_numeric(column, value[:from]), column.options) if value[:from].present?
+        to = "- #{format_number_value(controller.class.condition_value_for_numeric(column, value[:to]), column.options)}" if value[:opt] == 'BETWEEN'
+        format_human_condition column, value[:opt].downcase, from, to
+      end
+      alias_method :active_scaffold_human_condition_decimal, :active_scaffold_human_condition_integer
+      alias_method :active_scaffold_human_condition_float, :active_scaffold_human_condition_integer
+
+      def active_scaffold_human_condition_string(column, value)
+        opt = ActiveScaffold::Finder::STRING_COMPARATORS.index(value[:opt]) || value[:opt]
+        to = "- #{value[:to]}" if opt == 'BETWEEN'
+        format_human_condition column, opt, "'#{value[:from]}'", to
+      end
+
+      def active_scaffold_human_condition_date(column, value)
+        conversion = column.column.type == :date ? :to_date : :to_time
+        from = I18n.l controller.condition_value_for_datetime(column, value[:from], conversion)
+        to = "- #{I18n.l controller.condition_value_for_datetime(column, value[:to], conversion)}" if value[:opt] == 'BETWEEN'
+        format_human_condition column, value[:opt], from, to
+      end
+      alias_method :active_scaffold_human_condition_time, :active_scaffold_human_condition_date
+      alias_method :active_scaffold_human_condition_datetime, :active_scaffold_human_condition_date
+      alias_method :active_scaffold_human_condition_timestamp, :active_scaffold_human_condition_date
+
+      def active_scaffold_human_condition_boolean(column, value)
+        attribute = column.active_record_class.human_attribute_name(column.name)
+        label = as_(ActiveScaffold::Core.column_type_cast(value, column.column) ? :true : :false)
+        as_(:boolean, :scope => :human_conditions, :column => attribute, :value => label)
+      end
+      alias_method :active_scaffold_human_condition_checkbox, :active_scaffold_human_condition_boolean
+
+      def active_scaffold_human_condition_null(column, value)
+        format_human_condition column, value.to_sym
+      end
+
+      def active_scaffold_human_condition_select(column, associated)
+        attribute = column.active_record_class.human_attribute_name(column.name)
+        associated = [associated].compact unless associated.is_a? Array
+        if column.association
+          method = column.options[:label_method] || :to_label
+          associated = column.association.klass.where(:id => associated.map(&:to_i)).map(&method)
+        elsif column.options[:options]
+          associated = associated.collect do |value|
+            text, val = column.options[:options].find { |text, val| (val.nil? ? text : val).to_s == value.to_s }
+            value = active_scaffold_translated_option(column, text, val).first if text
+            value
           end
-        end unless value.nil?
+        end
+        as_(:association, :scope => :human_conditions, :column => attribute, :value => associated.join(', '))
       end
+      alias_method :active_scaffold_human_condition_multi_select, :active_scaffold_human_condition_select
+      alias_method :active_scaffold_human_condition_record_select, :active_scaffold_human_condition_select
 
       # the naming convention for overriding form fields with helpers
       def override_human_condition_column(column)

data/lib/active_scaffold/helpers/id_helpers.rb

@@ -3,11 +3,11 @@ module ActiveScaffold
     # A bunch of helper methods to produce the common view ids
     module IdHelpers
       def id_from_controller(controller)
-        controller.to_s.gsub("/", "__").html_safe
+        controller.to_s.gsub('/', '__').html_safe
       end
 
       def controller_id(controller = (params[:eid] || nested_id || params[:parent_controller] || params[:controller]))
-        controller_id ||= 'as_' + id_from_controller(controller)
+        'as_' + id_from_controller(controller)
       end
 
       def nested_parent_id
@@ -50,7 +50,7 @@ module ActiveScaffold
         "#{controller_id}-search-input"
       end
 
-      def action_link_id(link_action,link_id)
+      def action_link_id(link_action, link_id)
         "#{controller_id}-#{link_action}-#{link_id}-link"
       end
 
@@ -92,7 +92,7 @@ module ActiveScaffold
         options[:id] ||= nested_parent_id if nested?
         clean_id "#{controller_id}-#{options[:action]}-#{options[:id]}-loading-indicator"
       end
-      
+
       def sub_section_id(options = {})
         options[:id] ||= params[:id]
         options[:id] ||= nested_parent_id if nested?
@@ -104,7 +104,7 @@ module ActiveScaffold
         options[:id] ||= nested_parent_id if nested?
         clean_id "#{controller_id}-#{options[:id]}-#{options[:association]}-subform"
       end
-      
+
       def sub_form_list_id(options = {})
         options[:id] ||= params[:id]
         options[:id] ||= nested_parent_id if nested?
@@ -121,7 +121,7 @@ module ActiveScaffold
       def action_iframe_id(options)
         "#{controller_id}-#{options[:action]}-#{options[:id]}-iframe"
       end
-      
+
       def scope_id(scope)
         scope.gsub(/(\[|\])/, '_').gsub('__', '_').gsub(/_$/, '')
       end

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -4,59 +4,51 @@ module ActiveScaffold
     # Helpers that assist with the rendering of a List Column
     module ListColumnHelpers
       def get_column_value(record, column)
-        begin
-          method = get_column_method(record, column)
-          value = send(method, record, column)
-          value = ' '.html_safe if value.nil? or value.blank? # fix for IE 6
-          return value
-        rescue Exception => e
-          logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}, record: #{record.inspect}"
-          raise e
-        end
+        method = get_column_method(record, column)
+        value = send(method, record, column)
+        value = ' '.html_safe if value.nil? || value.blank? # fix for IE 6
+        return value
+      rescue StandardError => e
+        logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}, record: #{record.inspect}"
+        raise e
       end
 
-
       def get_column_method(record, column)
         # check for an override helper
-        method = column.list_method
-        unless method
-          method = if (method = column_override(column))
+        column.list_method ||= begin
+          if (method = column_override(column))
             # we only pass the record as the argument. we previously also passed the formatted_value,
             # but mike perham pointed out that prohibited the usage of overrides to improve on the
             # performance of our default formatting. see issue #138.
             method
           # second, check if the dev has specified a valid list_ui for this column
-          elsif column.list_ui and (method = override_column_ui(column.list_ui))
+          elsif column.list_ui && (method = override_column_ui(column.list_ui))
             method
-          elsif column.column and (method = override_column_ui(column.column.type))
+          elsif column.column && (method = override_column_ui(column.column.type))
             method
           else
             :format_column_value
           end
-          column.list_method = method
         end
-        method
       end
 
       # TODO: move empty_field_text and   logic in here?
       # TODO: we need to distinguish between the automatic links *we* create and the ones that the dev specified. some logic may not apply if the dev specified the link.
       def render_list_column(text, column, record)
-        begin
-          if column.link && !skip_action_link?(column.link, record)
-            link = column.link
-            associated = record.send(column.association.name) if column.association
-            render_action_link(link, record, :link => text, :authorized => link.action.nil? || column_link_authorized?(link, column, record, associated))
-          elsif inplace_edit?(record, column)
-            active_scaffold_inplace_edit(record, column, {:formatted_column => text})
-          elsif active_scaffold_config.actions.include?(:list) && active_scaffold_config.list.wrap_tag
-            content_tag active_scaffold_config.list.wrap_tag, text
-          else
-            text
-          end
-        rescue Exception => e
-          logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
-          raise e
+        if column.link && !skip_action_link?(column.link, record)
+          link = column.link
+          associated = record.send(column.association.name) if column.association
+          render_action_link(link, record, :link => text, :authorized => link.action.nil? || column_link_authorized?(link, column, record, associated))
+        elsif inplace_edit?(record, column)
+          active_scaffold_inplace_edit(record, column, :formatted_column => text)
+        elsif active_scaffold_config.actions.include?(:list) && active_scaffold_config.list.wrap_tag
+          content_tag active_scaffold_config.list.wrap_tag, text
+        else
+          text
         end
+      rescue StandardError => e
+        logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
+        raise e
       end
 
       # There are two basic ways to clean a column's value: h() and sanitize(). The latter is useful
@@ -114,7 +106,7 @@ module ActiveScaffold
         value ||= record.send(column.name) unless record.nil?
         if column.association.nil?
           if column.form_ui == :select && column.options[:options]
-            text, val = column.options[:options].find {|text, val| (val.nil? ? text : val).to_s == value.to_s}
+            text, val = column.options[:options].find { |text, val| (val.nil? ? text : val).to_s == value.to_s }
             value = active_scaffold_translated_option(column, text, val).first if text
           end
           if value.is_a? Numeric
@@ -147,43 +139,51 @@ module ActiveScaffold
         clean_column_value(value)
       end
 
+      def format_collection_association_value(value, column, label_method, size)
+        if column.associated_limit.nil?
+          firsts = value.collect(&label_method)
+        elsif column.associated_limit == 0
+          size if column.associated_number?
+        else
+          firsts = value.first(column.associated_limit)
+          firsts.collect!(&label_method)
+          firsts << '…' if value.size > column.associated_limit
+          text = firsts.join(h(active_scaffold_config.list.association_join_text)).html_safe
+          text << " (#{size})" if column.associated_number? && column.associated_limit && value.size > column.associated_limit
+          text
+        end
+      end
+
+      def format_singular_association_value(value, column, label_method)
+        if column.polymorphic_association?
+          "#{value.class.model_name.human}: #{value.send(label_method)}"
+        else
+          value.send(label_method)
+        end
+      end
+
       def format_association_value(value, column, size)
         method = column.options[:label_method] || :to_label
-        value = if column.association.collection?
-          if column.associated_limit.nil?
-            firsts = value.collect(&method)
-          else
-            firsts = value.first(column.associated_limit)
-            firsts.collect!(&method)
-            firsts[column.associated_limit] = '…' if value.size > column.associated_limit
+        value =
+          if column.association.collection?
+            format_collection_association_value(value, column, method, size)
+          elsif value
+            format_singular_association_value(value, column, method)
           end
-          if column.associated_limit == 0
-            size if column.associated_number?
-          else
-            joined_associated = firsts.join(h(active_scaffold_config.list.association_join_text)).html_safe
-            joined_associated << " (#{size})" if column.associated_number? and column.associated_limit and value.size > column.associated_limit
-            joined_associated
-          end
-        elsif value
-          if column.polymorphic_association?
-            "#{value.class.model_name.human}: #{value.send(method)}"
-          else
-            value.send(method)
-          end
-        end
         format_value value
       end
 
       def format_value(column_value, options = {})
-        value = if column_empty?(column_value)
-          empty_field_text
-        elsif column_value.is_a?(Time) || column_value.is_a?(Date)
-          l(column_value, :format => options[:format] || :default)
-        elsif [FalseClass, TrueClass].include?(column_value.class)
-          as_(column_value.to_s.to_sym)
-        else
-          column_value.to_s
-        end
+        value =
+          if column_empty?(column_value)
+            empty_field_text
+          elsif column_value.is_a?(Time) || column_value.is_a?(Date)
+            l(column_value, :format => options[:format] || :default)
+          elsif [FalseClass, TrueClass].include?(column_value.class)
+            as_(column_value.to_s.to_sym)
+          else
+            column_value.to_s
+          end
         clean_column_value(value)
       end
 
@@ -204,19 +204,18 @@ module ActiveScaffold
       # ==========
 
       def inplace_edit?(record, column)
-        if column.inplace_edit
-          editable = controller.send(:update_authorized?, record) if controller.respond_to?(:update_authorized?, true)
-          editable ||= record.authorized_for?(:crud_type => :update, :column => column.name)
-        end
+        return unless column.inplace_edit
+        editable = controller.send(:update_authorized?, record) if controller.respond_to?(:update_authorized?, true)
+        editable || record.authorized_for?(:crud_type => :update, :column => column.name)
       end
 
       def inplace_edit_cloning?(column)
-         column.inplace_edit != :ajax and (override_form_field?(column) or column.form_ui or (column.column and override_input?(column.column.type)))
+        column.inplace_edit != :ajax && (override_form_field?(column) || column.form_ui || (column.column && override_input?(column.column.type)))
       end
 
       def active_scaffold_inplace_edit_tag_options(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",
+        tag_options = {:id => element_cell_id(id_options), :class => 'in_place_editor_field',
                        :title => as_(:click_to_edit), :data => {:ie_id => record.to_param}}
         tag_options[:data][:ie_update] = column.inplace_edit if column.inplace_edit != true
         tag_options
@@ -225,32 +224,31 @@ module ActiveScaffold
       def active_scaffold_inplace_edit(record, column, options = {})
         formatted_column = options[:formatted_column] || format_column_value(record, column)
         content_tag(:span, as_(:inplace_edit_handle), :class => 'handle') <<
-        content_tag(:span, formatted_column, active_scaffold_inplace_edit_tag_options(record, column))
+          content_tag(:span, formatted_column, active_scaffold_inplace_edit_tag_options(record, column))
       end
 
       def inplace_edit_control(column)
-        if inplace_edit?(active_scaffold_config.model, column) and inplace_edit_cloning?(column)
-          old_record, @record = @record, new_model # TODO remove when relying on @record is removed
-          column = column.clone
-          column.options = column.options.clone
-          column.form_ui = :select if (column.association && column.form_ui.nil?)
-          options = active_scaffold_input_options(column).merge(:object => new_model)
-          options[:class] = "#{options[:class]} inplace_field"
-          options[:"data-id"] = options[:id]
-          options[:id] = nil
-          content_tag(:div, active_scaffold_input_for(column, nil, options), :style => "display:none;", :class => inplace_edit_control_css_class).tap do
-            @record = old_record # TODO remove when relying on @record is removed
-          end
+        return unless inplace_edit?(active_scaffold_config.model, column) && inplace_edit_cloning?(column)
+        old_record, @record = @record, active_scaffold_config.model.new # TODO: remove when relying on @record is removed
+        column = column.clone
+        column.options = column.options.clone
+        column.form_ui = :select if column.association && column.form_ui.nil?
+        options = active_scaffold_input_options(column).merge(:object => active_scaffold_config.model.new)
+        options[:class] = "#{options[:class]} inplace_field"
+        options[:"data-id"] = options[:id]
+        options[:id] = nil
+        content_tag(:div, active_scaffold_input_for(column, nil, options), :style => 'display:none;', :class => inplace_edit_control_css_class).tap do
+          @record = old_record # TODO: remove when relying on @record is removed
         end
       end
 
       def inplace_edit_control_css_class
-        "as_inplace_pattern"
+        'as_inplace_pattern'
       end
 
       def inplace_edit_data(column)
         data = {}
-        data[:ie_url] = url_for(params_for(:action => "update_column", :column => column.name, :id => '__id__'))
+        data[:ie_url] = url_for(params_for(: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)
@@ -275,22 +273,22 @@ module ActiveScaffold
 
       def all_marked?
         if active_scaffold_config.mark.mark_all_mode == :page
-          all_marked = @page.items.detect { |record| !marked_records.include?(record.id) }.nil?
+          @page.items.detect { |record| !marked_records.include?(record.id) }.nil?
         else
-          all_marked = (marked_records.length >= @page.pager.count.to_i)
+          marked_records.length >= @page.pager.count.to_i
         end
       end
 
       def mark_column_heading
         tag_options = {
           :id => "#{controller_id}_mark_heading",
-          :class => "mark_heading in_place_editor_field",
+          :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 column_heading_attributes(column, sorting, sort_direction)
-        tag_options = {:id => active_scaffold_column_header_id(column), :class => column_heading_class(column, sorting), :title => strip_tags(column.description).presence}
+        {:id => active_scaffold_column_header_id(column), :class => column_heading_class(column, sorting), :title => strip_tags(column.description).presence}
       end
 
       def render_column_heading(column, sorting, sort_direction)
@@ -306,16 +304,15 @@ module ActiveScaffold
         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.name == :as_marked
           mark_column_heading
         elsif column.sortable?
-          options = {:id => nil, :class => "as_sort",
+          options = {:id => nil, :class => 'as_sort',
                      'data-page-history' => controller_id,
                      :remote => true, :method => :get}
           url_options = params_for(:action => :index, :page => 1,
-                           :sort => column.name, :sort_direction => sort_direction)
+                                   :sort => column.name, :sort_direction => sort_direction)
           unless active_scaffold_config.store_user_settings
             url_options.merge!(:search => search_params) if search_params.present?
           end
@@ -324,12 +321,10 @@ module ActiveScaffold
           content_tag(:p, column_heading_label(column))
         end
       end
-      
+
       def column_heading_label(column)
         column.label
       end
-      
     end
   end
 end
-