activeadmin 1.4.2 → 2.9.0

data/lib/active_admin/filters/resource_extension.rb

@@ -123,25 +123,49 @@ module ActiveAdmin
       # Returns a default set of filters for the associations
       def default_association_filters
         if resource_class.respond_to?(:reflect_on_all_associations)
-          poly, not_poly = resource_class.reflect_on_all_associations.partition{ |r| r.macro == :belongs_to && r.options[:polymorphic] }
+          poly, not_poly = resource_class.reflect_on_all_associations.partition { |r| r.macro == :belongs_to && r.options[:polymorphic] }
 
           # remove deeply nested associations
-          not_poly.reject!{ |r| r.chain.length > 2 }
+          not_poly.reject! { |r| r.chain.length > 2 }
 
           filters = poly.map(&:foreign_type) + not_poly.map(&:name)
+
+          # Check high-arity associations for filterable columns
+          max = namespace.maximum_association_filter_arity
+          if max != :unlimited
+            high_arity, low_arity = not_poly.partition do |r|
+              r.klass.reorder(nil).limit(max + 1).count > max
+            end
+
+            # Remove high-arity associations with no searchable column
+            high_arity = high_arity.select(&method(:searchable_column_for))
+
+            high_arity = high_arity.map { |r| r.name.to_s + "_" + searchable_column_for(r) + namespace.filter_method_for_large_association }
+
+            filters = poly.map(&:foreign_type) + low_arity.map(&:name) + high_arity
+          end
+
           filters.map &:to_sym
         else
           []
         end
       end
 
+      def search_columns
+        @search_columns ||= namespace.filter_columns_for_large_association.map(&:to_s)
+      end
+
+      def searchable_column_for(relation)
+        relation.klass.column_names.find { |name| search_columns.include?(name) }
+      end
+
       def add_filters_sidebar_section
         self.sidebar_sections << filters_sidebar_section
       end
 
       def filters_sidebar_section
-        ActiveAdmin::SidebarSection.new :filters, only: :index, if: ->{ active_admin_config.filters.any? } do
-          active_admin_filters_form_for assigns[:search], active_admin_config.filters
+        ActiveAdmin::SidebarSection.new :filters, only: :index, if: -> { active_admin_config.filters.any? } do
+          active_admin_filters_form_for assigns[:search], **active_admin_config.filters
         end
       end
 

data/lib/active_admin/form_builder.rb

@@ -20,9 +20,9 @@ module ActiveAdmin
     self.input_class_finder = ::Formtastic::InputClassFinder
     self.action_class_finder = ::Formtastic::ActionClassFinder
 
-    def cancel_link(url = {action: "index"}, html_options = {}, li_attrs = {})
+    def cancel_link(url = { action: "index" }, html_options = {}, li_attrs = {})
       li_attrs[:class] ||= "cancel"
-      li_content = template.link_to I18n.t('active_admin.cancel'), url, html_options
+      li_content = template.link_to I18n.t("active_admin.cancel"), url, html_options
       template.content_tag(:li, li_content, li_attrs)
     end
 
@@ -40,14 +40,14 @@ module ActiveAdmin
     attr_reader :assoc
     attr_reader :options
     attr_reader :heading, :sortable_column, :sortable_start
-    attr_reader :new_record, :destroy_option
+    attr_reader :new_record, :destroy_option, :remove_record
 
     def initialize(has_many_form, assoc, options)
       super has_many_form
       @assoc = assoc
       @options = extract_custom_settings!(options.dup)
       @options.reverse_merge!(for: assoc)
-      @options[:class] = [options[:class], "inputs has_many_fields"].compact.join(' ')
+      @options[:class] = [options[:class], "inputs has_many_fields"].compact.join(" ")
 
       if sortable_column
         @options[:for] = [assoc, sorted_children(sortable_column)]
@@ -69,9 +69,10 @@ module ActiveAdmin
     def extract_custom_settings!(options)
       @heading = options.key?(:heading) ? options.delete(:heading) : default_heading
       @sortable_column = options.delete(:sortable)
-      @sortable_start  = options.delete(:sortable_start) || 0
+      @sortable_start = options.delete(:sortable_start) || 0
       @new_record = options.key?(:new_record) ? options.delete(:new_record) : true
       @destroy_option = options.delete(:allow_destroy)
+      @remove_record = options.delete(:remove_record)
       options
     end
 
@@ -93,7 +94,7 @@ module ActiveAdmin
       contents = without_wrapper { inputs(options, &form_block) }
       contents ||= "".html_safe
 
-      js = new_record ? js_for_has_many(options[:class], &form_block) : ''
+      js = new_record ? js_for_has_many(options[:class], &form_block) : ""
       contents << js
     end
 
@@ -107,19 +108,21 @@ module ActiveAdmin
     def has_many_actions(form_builder, contents)
       if form_builder.object.new_record?
         contents << template.content_tag(:li) do
-          template.link_to I18n.t('active_admin.has_many_remove'), "#", class: 'button has_many_remove'
+          remove_text = remove_record.is_a?(String) ? remove_record : I18n.t("active_admin.has_many_remove")
+          template.link_to remove_text, "#", class: "button has_many_remove"
         end
       elsif allow_destroy?(form_builder.object)
-        form_builder.input(:_destroy, as: :boolean,
-                            wrapper_html: {class: 'has_many_delete'},
-                            label: I18n.t('active_admin.has_many_delete'))
+        form_builder.input(
+          :_destroy, as: :boolean,
+                     wrapper_html: { class: "has_many_delete" },
+                     label: I18n.t("active_admin.has_many_delete"))
       end
 
       if sortable_column
         form_builder.input sortable_column, as: :hidden
 
-        contents << template.content_tag(:li, class: 'handle') do
-          I18n.t('active_admin.move')
+        contents << template.content_tag(:li, class: "handle") do
+          I18n.t("active_admin.move")
         end
       end
 
@@ -156,27 +159,28 @@ module ActiveAdmin
 
     # Capture the ADD JS
     def js_for_has_many(class_string, &form_block)
-      assoc_name       = assoc_klass.model_name
-      placeholder      = "NEW_#{assoc_name.to_s.underscore.upcase.gsub(/\//, '_')}_RECORD"
+      assoc_name = assoc_klass.model_name
+      placeholder = "NEW_#{assoc_name.to_s.underscore.upcase.gsub(/\//, '_')}_RECORD"
       opts = {
         for: [assoc, assoc_klass.new],
         class: class_string,
         for_options: { child_index: placeholder }
       }
-      html = template.capture{ __getobj__.send(:inputs_for_nested_attributes, opts, &form_block) }
-      text = new_record.is_a?(String) ? new_record : I18n.t('active_admin.has_many_new', model: assoc_name.human)
+      html = template.capture { __getobj__.send(:inputs_for_nested_attributes, opts, &form_block) }
+      text = new_record.is_a?(String) ? new_record : I18n.t("active_admin.has_many_new", model: assoc_name.human)
 
-      template.link_to text, '#', class: "button has_many_add", data: {
+      template.link_to text, "#", class: "button has_many_add", data: {
         html: CGI.escapeHTML(html).html_safe, placeholder: placeholder
       }
     end
 
     def wrap_div_or_li(html)
-      template.content_tag(already_in_an_inputs_block ? :li : :div,
-                           html,
-                           class: "has_many_container #{assoc}",
-                           'data-sortable' => sortable_column,
-                           'data-sortable-start' => sortable_start)
+      template.content_tag(
+        already_in_an_inputs_block ? :li : :div,
+        html,
+        class: "has_many_container #{assoc}",
+        "data-sortable" => sortable_column,
+        "data-sortable-start" => sortable_start)
     end
   end
 end

data/lib/active_admin/generators/boilerplate.rb

@@ -9,8 +9,16 @@ module ActiveAdmin
         @class_name.constantize.new.attributes.keys
       end
 
+      def assignable_attributes
+        attributes - %w(id created_at updated_at)
+      end
+
+      def permit_params
+        assignable_attributes.map { |a| a.to_sym.inspect }.join(", ")
+      end
+
       def rows
-        attributes.map { |a| row(a) }.join("\n")
+        attributes.map { |a| row(a) }.join("\n  ")
       end
 
       def row(name)
@@ -18,7 +26,7 @@ module ActiveAdmin
       end
 
       def columns
-        attributes.map { |a| column(a) }.join("\n")
+        attributes.map { |a| column(a) }.join("\n  ")
       end
 
       def column(name)
@@ -26,7 +34,7 @@ module ActiveAdmin
       end
 
       def filters
-        attributes.map { |a| filter(a) }.join("\n")
+        attributes.map { |a| filter(a) }.join("\n  ")
       end
 
       def filter(name)
@@ -34,7 +42,7 @@ module ActiveAdmin
       end
 
       def form_inputs
-        attributes.reject{|a| %w(id created_at updated_at).include? a}.map{ |a| form_input(a) }.join("\n")
+        assignable_attributes.map { |a| form_input(a) }.join("\n  ")
       end
 
       def form_input(name)

data/lib/active_admin/helpers/optional_display.rb

@@ -15,7 +15,7 @@ module ActiveAdmin
 
   module OptionalDisplay
     def display_on?(action, render_context = self)
-      return false if @options[:only]   && !@options[:only].include?(action.to_sym)
+      return false if @options[:only] && !@options[:only].include?(action.to_sym)
       return false if @options[:except] && @options[:except].include?(action.to_sym)
 
       case condition = @options[:if]
@@ -31,7 +31,7 @@ module ActiveAdmin
     private
 
     def normalize_display_options!
-      @options[:only]   = Array(@options[:only])   if @options[:only]
+      @options[:only] = Array(@options[:only]) if @options[:only]
       @options[:except] = Array(@options[:except]) if @options[:except]
     end
   end

data/lib/active_admin/helpers/scope_chain.rb

@@ -1,5 +1,6 @@
 module ActiveAdmin
   module ScopeChain
+    private
     # Scope an ActiveRecord::Relation chain
     #
     # Example:

data/lib/active_admin/inputs/datepicker_input.rb

@@ -3,7 +3,7 @@ module ActiveAdmin
     class DatepickerInput < ::Formtastic::Inputs::StringInput
       def input_html_options
         super.tap do |options|
-          options[:class] = [options[:class], "datepicker"].compact.join(' ')
+          options[:class] = [options[:class], "datepicker"].compact.join(" ")
           options[:data] ||= {}
           options[:data].merge! datepicker_options
         end
@@ -19,7 +19,7 @@ module ActiveAdmin
       private
       def datepicker_options
         options = self.options.fetch(:datepicker_options, {})
-        options = Hash[options.map{ |k, v| [k.to_s.camelcase(:lower), v] }]
+        options = Hash[options.map { |k, v| [k.to_s.camelcase(:lower), v] }]
         { datepicker_options: options }
       end
     end

data/lib/active_admin/inputs/filters/base.rb

@@ -25,7 +25,7 @@ module ActiveAdmin
 
         def wrapper_html_options
           opts = super
-          (opts[:class] ||= '') << " filter_form_field filter_#{as}"
+          (opts[:class] ||= "") << " filter_form_field filter_#{as}"
           opts
         end
 

data/lib/active_admin/inputs/filters/base/search_method_select.rb

@@ -31,15 +31,15 @@ module ActiveAdmin
 
           def wrapper_html_options
             opts = super
-            (opts[:class] ||= '') << ' select_and_search' unless seems_searchable?
+            (opts[:class] ||= "") << " select_and_search" unless seems_searchable?
             opts
           end
 
           def to_html
             input_wrapping do
-              label_html  << # your label
+              label_html << # your label
               select_html << # the dropdown that holds the available search methods
-              input_html     # your input field
+              input_html # your input field
             end
           end
 
@@ -48,7 +48,7 @@ module ActiveAdmin
           end
 
           def select_html
-            template.select_tag '', template.options_for_select(filter_options, current_filter)
+            template.select_tag "", template.options_for_select(filter_options, current_filter)
           end
 
           def filters
@@ -57,8 +57,8 @@ module ActiveAdmin
 
           def current_filter
             @current_filter ||= begin
-              methods = filters.map{ |f| "#{method}_#{f}" }
-              methods.detect{ |m| @object.public_send m } || methods.first
+              methods = filters.map { |f| "#{method}_#{f}" }
+              methods.detect { |m| @object.public_send m } || methods.first
             end
           end
 

data/lib/active_admin/inputs/filters/boolean_input.rb

@@ -16,7 +16,7 @@ module ActiveAdmin
 
         # Provide the AA translation to the blank input field.
         def include_blank
-          I18n.t 'active_admin.any' if super
+          I18n.t "active_admin.any" if super
         end
       end
     end

data/lib/active_admin/inputs/filters/check_boxes_input.rb

@@ -22,7 +22,7 @@ module ActiveAdmin
 
         # Add whitespace before label
         def choice_label(choice)
-          ' ' + super
+          " " + super
         end
 
         # Don't wrap in UL tag

data/lib/active_admin/inputs/filters/date_range_input.rb

@@ -7,8 +7,8 @@ module ActiveAdmin
         def to_html
           input_wrapping do
             [ label_html,
-              builder.text_field(gt_input_name, input_html_options(gt_input_name, gt_input_placeholder)),
-              builder.text_field(lt_input_name, input_html_options(lt_input_name, lt_input_placeholder)),
+              builder.text_field(gt_input_name, input_html_options_for(gt_input_name, gt_input_placeholder)),
+              builder.text_field(lt_input_name, input_html_options_for(lt_input_name, lt_input_placeholder)),
             ].join("\n").html_safe
           end
         end
@@ -22,18 +22,21 @@ module ActiveAdmin
           column && column.type == :date ? "#{method}_lteq" : "#{method}_lteq_datetime"
         end
 
-        def input_html_options(input_name = gt_input_name, placeholder = gt_input_placeholder)
-          current_value = begin
-            #cast value to date object before rendering input
-            @object.public_send(input_name).to_s.to_date
-          rescue
-            nil
-          end
+        def input_html_options
           { size: 12,
             class: "datepicker",
-            maxlength: 10,
-            placeholder: placeholder,
-            value: current_value ? current_value.strftime("%Y-%m-%d") : "" }
+            maxlength: 10 }.merge(options[:input_html] || {})
+        end
+
+        def input_html_options_for(input_name, placeholder)
+          current_value = begin
+                            #cast value to date object before rendering input
+                            @object.public_send(input_name).to_s.to_date
+                          rescue
+                            nil
+                          end
+          { placeholder: placeholder,
+            value: current_value ? current_value.strftime("%Y-%m-%d") : "" }.merge(input_html_options)
         end
 
         def gt_input_placeholder

data/lib/active_admin/inputs/filters/select_input.rb

@@ -7,7 +7,7 @@ module ActiveAdmin
         def input_name
           return method if seems_searchable?
 
-          searchable_method_name + (multiple? ? '_in' : '_eq')
+          searchable_method_name + (multiple? ? "_in" : "_eq")
         end
 
         def searchable_method_name
@@ -22,7 +22,7 @@ module ActiveAdmin
 
         # Provide the AA translation to the blank input field.
         def include_blank
-          I18n.t 'active_admin.any' if super
+          I18n.t "active_admin.any" if super
         end
 
         def input_html_options_name

data/lib/active_admin/localizers.rb

@@ -1,4 +1,4 @@
-require 'active_admin/localizers/resource_localizer'
+require "active_admin/localizers/resource_localizer"
 
 module ActiveAdmin
   module Localizers

data/lib/active_admin/localizers/resource_localizer.rb

@@ -19,16 +19,16 @@ module ActiveAdmin
 
       def translate(key, options = {})
         scope = options.delete(:scope)
-        specific_key = array_to_key('resources', @model_name, scope, key)
+        specific_key = array_to_key("resources", @model_name, scope, key)
         defaults = [array_to_key(scope, key), key.to_s.titleize]
-        ::I18n.t specific_key, options.reverse_merge(model: @model, default: defaults, scope: 'active_admin')
+        ::I18n.t specific_key, **options.reverse_merge(model: @model, default: defaults, scope: "active_admin")
       end
       alias_method :t, :translate
 
       protected
 
       def array_to_key(*arr)
-        arr.flatten.compact.join('.').to_sym
+        arr.flatten.compact.join(".").to_sym
       end
     end
   end

data/lib/active_admin/menu.rb

@@ -47,7 +47,10 @@ module ActiveAdmin
       #   menu.add parent: 'Dashboard', label: 'My Child Dashboard'
       #
       def add(options)
-        item = if parent = options.delete(:parent)
+        parent_chain = Array.wrap(options.delete(:parent))
+
+        item = if parent = parent_chain.shift
+                 options[:parent] = parent_chain if parent_chain.any?
                  (self[parent] || add(label: parent)).add options
                else
                  _add options.merge parent: self
@@ -60,7 +63,7 @@ module ActiveAdmin
 
       # Whether any children match the given item.
       def include?(item)
-        @children.values.include? item
+        @children.values.include?(item) || @children.values.any? { |child| child.include?(item) }
       end
 
       # Used in the UI to visually distinguish which menu item is selected.
@@ -87,7 +90,7 @@ module ActiveAdmin
       def normalize_id(id)
         case id
         when String, Symbol, ActiveModel::Name
-          id.to_s.downcase.tr ' ', '_'
+          id.to_s.downcase.tr " ", "_"
         when ActiveAdmin::Resource::Name
           id.param_key
         else