activeadmin 1.1.0 → 2.5.0

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,7 +22,7 @@ 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)
+        def input_html_options_for(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
@@ -33,7 +33,7 @@ module ActiveAdmin
             class: "datepicker",
             maxlength: 10,
             placeholder: placeholder,
-            value: current_value ? current_value.strftime("%Y-%m-%d") : "" }
+            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

@@ -15,7 +15,7 @@ module ActiveAdmin
             "#{reflection.through_reflection.name}_#{reflection.foreign_key}"
           else
             name = method.to_s
-            name.concat '_id' if reflection
+            name.concat "_#{reflection.association_primary_key}" if reflection_searchable?
             name
           end
         end
@@ -48,6 +48,10 @@ module ActiveAdmin
           klass.reorder("#{method} asc").distinct.pluck method
         end
 
+        def reflection_searchable?
+          reflection && !reflection.polymorphic?
+        end
+
       end
     end
   end

data/lib/active_admin/menu.rb

@@ -68,14 +68,8 @@ module ActiveAdmin
         self == item || include?(item)
       end
 
-      # Returns sorted array of menu items that should be displayed in this context.
-      # Sorts by priority first, then alphabetically by label if needed.
-      def items(context = nil)
-        @children.values.select{ |i| i.display?(context) }.sort do |a, b|
-          result = a.priority       <=> b.priority
-          result = a.label(context) <=> b.label(context) if result == 0
-          result
-        end
+      def items
+        @children.values
       end
 
       attr_reader :children

data/lib/active_admin/menu_item.rb

@@ -1,9 +1,6 @@
-require 'active_admin/view_helpers/method_or_proc_helper'
-
 module ActiveAdmin
   class MenuItem
     include Menu::MenuNode
-    include MethodOrProcHelper
 
     attr_reader :html_options, :parent, :priority
 
@@ -53,7 +50,7 @@ module ActiveAdmin
       @url            = options[:url]          || '#'
       @priority       = options[:priority]     || 10
       @html_options   = options[:html_options] || {}
-      @should_display = options[:if]           || proc{true}
+      @should_display = options[:if]           || proc { true }
       @parent         = options[:parent]
 
       yield(self) if block_given? # Builder style syntax
@@ -63,35 +60,10 @@ module ActiveAdmin
       @id ||= normalize_id @dirty_id
     end
 
-    def label(context = nil)
-      render_in_context context, @label
-    end
-
-    def url(context = nil)
-      render_in_context context, @url
-    end
+    attr_reader :label
+    attr_reader :url
 
     # Don't display if the :if option passed says so
-    # Don't display if the link isn't real, we have children, and none of the children are being displayed.
-    def display?(context = nil)
-      return false unless render_in_context(context, @should_display)
-      return false if     !real_url?(context) && @children.any? && !items(context).any?
-      true
-    end
-
-    # Returns an array of the ancestry of this menu item.
-    # The first item is the immediate parent of the item.
-    def ancestors
-      parent ? [parent, parent.ancestors].flatten : []
-    end
-
-    private
-
-    # URL is not nil, empty, or '#'
-    def real_url?(context = nil)
-      url = url context
-      url.present? && url != '#'
-    end
-
+    attr_reader :should_display
   end
 end

data/lib/active_admin/namespace.rb

@@ -25,6 +25,12 @@ module ActiveAdmin
   # resource will be accessible from "/posts" and the controller will be PostsController.
   #
   class Namespace
+    class << self
+      def setting(name, default)
+        Deprecation.warn "This method does not do anything and will be removed."
+      end
+    end
+
     RegisterEvent = 'active_admin.namespace.register'.freeze
 
     attr_reader :application, :resources, :menus
@@ -41,6 +47,18 @@ module ActiveAdmin
       @name.to_sym
     end
 
+    def settings
+      @settings ||= SettingsNode.build(application.namespace_settings)
+    end
+
+    def respond_to_missing?(method, include_private = false)
+      settings.respond_to?(method) || super
+    end
+
+    def method_missing(method, *args)
+      settings.respond_to?(method) ? settings.send(method, *args) : super
+    end
+
     # Register a resource into this namespace. The preffered method to access this is to
     # use the global registration ActiveAdmin.register which delegates to the proper
     # namespace instance.
@@ -100,12 +118,6 @@ module ActiveAdmin
       resources[klass]
     end
 
-    # Override from ActiveAdmin::Settings to inherit default attributes
-    # from the application
-    def read_default_setting(name)
-      application.public_send name
-    end
-
     def fetch_menu(name)
       @menus.fetch(name)
     end
@@ -138,8 +150,8 @@ module ActiveAdmin
       if logout_link_path
         html_options = html_options.reverse_merge(method: logout_link_method || :get)
         menu.add id: 'logout', priority: priority, html_options: html_options,
-          label: ->{ I18n.t 'active_admin.logout' },
-          url:   ->{ render_or_call_method_or_proc_on self, active_admin_namespace.logout_link_path },
+          label: -> { I18n.t 'active_admin.logout' },
+          url:   -> { render_or_call_method_or_proc_on self, active_admin_namespace.logout_link_path },
           if:    :current_active_admin_user?
       end
     end

data/lib/active_admin/namespace_settings.rb

@@ -0,0 +1,123 @@
+require 'active_admin/dynamic_settings_node'
+
+module ActiveAdmin
+  class NamespaceSettings < DynamicSettingsNode
+    # The default number of resources to display on index pages
+    register :default_per_page, 30
+
+    # The max number of resources to display on index pages and batch exports
+    register :max_per_page, 10_000
+
+    # The title which gets displayed in the main layout
+    register :site_title, "", :string_symbol_or_proc
+
+    # Set the site title link href (defaults to AA dashboard)
+    register :site_title_link, ""
+
+    # Set the site title image displayed in the main layout (has precendence over :site_title)
+    register :site_title_image, "", :string_symbol_or_proc
+
+    # Add to the site head
+    register :head, "", :string_symbol_or_proc
+
+    # Set the site footer text (defaults to Powered by ActiveAdmin text with version)
+    register :footer, "", :string_symbol_or_proc
+
+    # Set a favicon
+    register :favicon, false
+
+    # Additional meta tags to place in head of logged in pages
+    register :meta_tags, {}
+
+    # Additional meta tags to place in head of logged out pages
+    register :meta_tags_for_logged_out_pages, { robots: "noindex, nofollow" }
+
+    # The view factory to use to generate all the view classes. Take
+    # a look at ActiveAdmin::ViewFactory
+    register :view_factory, ActiveAdmin::ViewFactory.new
+
+    # The method to call in controllers to get the current user
+    register :current_user_method, false
+
+    # The method to call in the controllers to ensure that there
+    # is a currently authenticated admin user
+    register :authentication_method, false
+
+    # The path to log user's out with. If set to a symbol, we assume
+    # that it's a method to call which returns the path
+    register :logout_link_path, :destroy_admin_user_session_path
+
+    # The method to use when generating the link for user logout
+    register :logout_link_method, :get
+
+    # Whether the batch actions are enabled or not
+    register :batch_actions, false
+
+    # Whether filters are enabled
+    register :filters, true
+
+    # The namespace root
+    register :root_to, 'dashboard#index'
+
+    # Options that are passed to root_to
+    register :root_to_options, {}
+
+    # Options passed to the routes, i.e. { path: '/custom' }
+    register :route_options, {}
+
+    # Display breadcrumbs
+    register :breadcrumb, true
+
+    # Display create another checkbox on a new page
+    # @return [Boolean] (true)
+    register :create_another, false
+
+    # Default CSV options
+    register :csv_options, { col_sep: ',', byte_order_mark: "\xEF\xBB\xBF" }
+
+    # Default Download Links options
+    register :download_links, true
+
+    # The authorization adapter to use
+    register :authorization_adapter, ActiveAdmin::AuthorizationAdapter
+
+    # A proc to be used when a user is not authorized to view the current resource
+    register :on_unauthorized_access, :rescue_active_admin_access_denied
+
+    # A regex to detect unsupported browser, set to false to disable
+    register :unsupported_browser_matcher, /MSIE [1-8]\.0/
+
+    # Whether to display 'Current Filters' on search screen
+    register :current_filters, true
+
+    # class to handle ordering
+    register :order_clause, ActiveAdmin::OrderClause
+
+    # default show_count for scopes
+    register :scopes_show_count, true
+
+    # Request parameters that are permitted by default
+    register :permitted_params, [
+      :utf8, :_method, :authenticity_token, :commit, :id
+    ]
+
+    # Set flash message keys that shouldn't show in ActiveAdmin
+    register :flash_keys_to_except, ['timedout']
+
+    # Include association filters by default
+    register :include_default_association_filters, true
+
+    register :maximum_association_filter_arity, :unlimited
+
+    register :filter_columns_for_large_association, [
+        :display_name,
+        :full_name,
+        :name,
+        :username,
+        :login,
+        :title,
+        :email,
+    ]
+    register :filter_method_for_large_association, '_starts_with'
+  end
+end

data/lib/active_admin/order_clause.rb

@@ -3,7 +3,7 @@ module ActiveAdmin
     attr_reader :field, :order, :active_admin_config
 
     def initialize(active_admin_config, clause)
-      clause =~ /^([\w\_\.]+)(->'\w+')?_(desc|asc)$/
+      clause =~ /^([\w\.]+)(->'\w+')?_(desc|asc)$/
       @column = $1
       @op = $2
       @order = $3
@@ -16,7 +16,7 @@ module ActiveAdmin
     end
 
     def apply(chain)
-      chain.reorder(sql)
+      chain.reorder(Arel.sql sql)
     end
 
     def to_sql

data/lib/active_admin/orm/active_record/comments/comment.rb

@@ -3,7 +3,7 @@ module ActiveAdmin
 
     self.table_name = "#{table_name_prefix}active_admin_comments#{table_name_suffix}"
 
-    belongs_to :resource, polymorphic: true
+    belongs_to :resource, polymorphic: true, optional: true
     belongs_to :author,   polymorphic: true
 
     validates_presence_of :body, :namespace, :resource
@@ -18,7 +18,7 @@ module ActiveAdmin
     def self.find_for_resource_in_namespace(resource, namespace)
       where(
         resource_type: resource_type(resource),
-        resource_id:   resource,
+        resource_id:   resource.id,
         namespace:     namespace.to_s
       ).order(ActiveAdmin.application.namespaces[namespace.to_sym].comments_order)
     end

data/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb

@@ -11,10 +11,12 @@ module ActiveAdmin
         attr_accessor :resource
 
         def build(resource)
-          @resource = resource
-          @comments = ActiveAdmin::Comment.find_for_resource_in_namespace(resource, active_admin_namespace.name).page(params[:page])
-          super(title, for: resource)
-          build_comments
+          if authorized?(ActiveAdmin::Auth::READ, ActiveAdmin::Comment)
+            @resource = resource
+            @comments = active_admin_authorization.scope_collection(ActiveAdmin::Comment.find_for_resource_in_namespace(resource, active_admin_namespace.name).includes(:author).page(params[:page]))
+            super(title, for: resource)
+            build_comments
+          end
         end
 
         protected
@@ -24,10 +26,18 @@ module ActiveAdmin
         end
 
         def build_comments
-          @comments.any? ? @comments.each(&method(:build_comment)) : build_empty_message
-          div page_entries_info(@comments).html_safe, class: 'pagination_information'
+          if @comments.any?
+            @comments.each(&method(:build_comment))
+            div page_entries_info(@comments).html_safe, class: 'pagination_information'
+          else
+            build_empty_message
+          end
+
           text_node paginate @comments
-          build_comment_form
+
+          if authorized?(ActiveAdmin::Auth::CREATE, ActiveAdmin::Comment)
+            build_comment_form
+          end
         end
 
         def build_comment(comment)

data/lib/active_admin/orm/active_record/comments.rb

@@ -17,6 +17,17 @@ ActiveAdmin.application.view_factory.show_page.send :include, ActiveAdmin::Comme
 # Load the model as soon as it's referenced. By that point, Rails & Kaminari will be ready
 ActiveAdmin.autoload :Comment, 'active_admin/orm/active_record/comments/comment'
 
+# Hint i18n-tasks about model and attribute translations used by default install
+# i18n-tasks-use t('activerecord.models.comment')
+# i18n-tasks-use t('activerecord.models.active_admin/comment')
+# i18n-tasks-use t('activerecord.attributes.active_admin/comment.author_type')
+# i18n-tasks-use t('activerecord.attributes.active_admin/comment.body')
+# i18n-tasks-use t('activerecord.attributes.active_admin/comment.created_at')
+# i18n-tasks-use t('activerecord.attributes.active_admin/comment.namespace')
+# i18n-tasks-use t('activerecord.attributes.active_admin/comment.resource_type')
+# i18n-tasks-use t('activerecord.attributes.active_admin/comment.updated_at')
+# i18n-tasks-use t('active_admin.scopes.all')
+
 # Walk through all the loaded namespaces after they're loaded
 ActiveAdmin.after_load do |app|
   app.namespaces.each do |namespace|
@@ -53,21 +64,21 @@ ActiveAdmin.after_load do |app|
         def create
           create! do |success, failure|
             success.html do
-              ActiveAdmin::Dependency.rails.redirect_back self, active_admin_root
+              redirect_back fallback_location: active_admin_root
             end
             failure.html do
               flash[:error] = I18n.t 'active_admin.comments.errors.empty_text'
-              ActiveAdmin::Dependency.rails.redirect_back self, active_admin_root
+              redirect_back fallback_location: active_admin_root
             end
           end
 
           def destroy
             destroy! do |success, failure|
               success.html do
-                ActiveAdmin::Dependency.rails.redirect_back self, active_admin_root
+                redirect_back fallback_location: active_admin_root
               end
               failure.html do
-                ActiveAdmin::Dependency.rails.redirect_back self, active_admin_root
+                redirect_back fallback_location: active_admin_root
               end
             end
           end

data/lib/active_admin/page_dsl.rb

@@ -21,7 +21,7 @@ module ActiveAdmin
     def page_action(name, options = {}, &block)
       config.page_actions << ControllerAction.new(name, options)
       controller do
-        define_method(name, &block || Proc.new{})
+        define_method(name, &block || Proc.new {})
       end
     end
 

data/lib/active_admin/page_presenter.rb

@@ -21,7 +21,8 @@ module ActiveAdmin
     delegate :has_key?, :fetch, to: :options
 
     def initialize(options = {}, &block)
-      @options, @block = options, block
+      @options = options
+      @block = block
     end
 
     def [](key)

data/lib/active_admin/pundit_adapter.rb

@@ -4,6 +4,7 @@ require 'pundit'
 
 # Add a setting to the application to configure the pundit default policy
 ActiveAdmin::Application.inheritable_setting :pundit_default_policy, nil
+ActiveAdmin::Application.inheritable_setting :pundit_policy_namespace, nil
 
 module ActiveAdmin
 
@@ -19,7 +20,7 @@ module ActiveAdmin
     def scope_collection(collection, action = Auth::READ)
       # scoping is appliable only to read/index action
       # which means there is no way how to scope other actions
-      Pundit.policy_scope!(user, collection)
+      Pundit.policy_scope!(user, namespace(collection))
     rescue Pundit::NotDefinedError => e
       if default_policy_class && default_policy_class.const_defined?(:Scope)
         default_policy_class::Scope.new(user, collection).resolve
@@ -30,9 +31,9 @@ module ActiveAdmin
 
     def retrieve_policy(subject)
       case subject
-      when nil   then Pundit.policy!(user, resource)
-      when Class then Pundit.policy!(user, subject.new)
-      else Pundit.policy!(user, subject)
+      when nil   then Pundit.policy!(user, namespace(resource))
+      when Class then Pundit.policy!(user, namespace(subject.new))
+      else Pundit.policy!(user, namespace(subject))
       end
     rescue Pundit::NotDefinedError => e
       if default_policy_class
@@ -43,7 +44,7 @@ module ActiveAdmin
     end
 
     def format_action(action, subject)
-      # https://github.com/elabs/pundit/blob/master/lib/generators/pundit/install/templates/application_policy.rb
+      # https://github.com/varvet/pundit/blob/master/lib/generators/pundit/install/templates/application_policy.rb
       case action
       when Auth::CREATE  then :create?
       when Auth::UPDATE  then :update?
@@ -55,6 +56,14 @@ module ActiveAdmin
 
     private
 
+    def namespace(object)
+      if default_policy_namespace && !object.class.to_s.include?(default_policy_namespace.to_s.camelize)
+        [default_policy_namespace.to_sym, object]
+      else
+        object
+      end
+    end
+
     def default_policy_class
       ActiveAdmin.application.pundit_default_policy && ActiveAdmin.application.pundit_default_policy.constantize
     end
@@ -63,6 +72,10 @@ module ActiveAdmin
       default_policy_class.new(user, subject)
     end
 
+    def default_policy_namespace
+      ActiveAdmin.application.pundit_policy_namespace
+    end
+
   end
 
 end

data/lib/active_admin/resource/action_items.rb

@@ -24,6 +24,7 @@ module ActiveAdmin
       #                         this action item on.
       #                 :except: A single or array of controller actions not to
       #                          display this action item on.
+      #                 :priority: A single integer value. To control the display order. Default is 10.
       def add_action_item(name, options = {}, &block)
         self.action_items << ActiveAdmin::ActionItem.new(name, options, &block)
       end
@@ -38,7 +39,7 @@ module ActiveAdmin
       #
       # @return [Array] Array of ActionItems for the controller actions
       def action_items_for(action, render_context = nil)
-        action_items.select{ |item| item.display_on? action, render_context }
+        action_items.select { |item| item.display_on? action, render_context }.sort_by(&:priority)
       end
 
       # Clears all the existing action items for this resource
@@ -86,7 +87,7 @@ module ActiveAdmin
           if controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, resource)
             localizer = ActiveAdmin::Localizers.resource(active_admin_config)
             link_to localizer.t(:delete_model), resource_path(resource), method: :delete,
-              data: {confirm: localizer.t(:delete_confirmation)}
+              data: { confirm: localizer.t(:delete_confirmation) }
           end
         end
       end
@@ -110,6 +111,10 @@ module ActiveAdmin
     def html_class
       "action_item #{@options[:class]}".rstrip
     end
+
+    def priority
+      @options[:priority] || 10
+    end
   end
 
 end

data/lib/active_admin/resource/attributes.rb

@@ -18,13 +18,13 @@ module ActiveAdmin
 
       def foreign_methods
         @foreign_methods ||= resource_class.reflect_on_all_associations.
-          select{ |r| r.macro == :belongs_to }.
-          reject{ |r| r.chain.length > 2 && !r.options[:polymorphic] }.
-          index_by{ |r| r.foreign_key.to_sym }
+          select { |r| r.macro == :belongs_to }.
+          reject { |r| r.chain.length > 2 && !r.options[:polymorphic] }.
+          index_by { |r| r.foreign_key.to_sym }
       end
 
       def reject_col?(c)
-        primary_col?(c) || sti_col?(c) || counter_cache_col?(c)
+        primary_col?(c) || sti_col?(c) || counter_cache_col?(c) || filtered_col?(c)
       end
 
       def primary_col?(c)
@@ -39,6 +39,9 @@ module ActiveAdmin
         c.name.end_with?('_count')
       end
 
+      def filtered_col?(c)
+        ActiveAdmin.application.filter_attributes.include?(c.name.to_sym)
+      end
     end
   end
 end

data/lib/active_admin/resource/belongs_to.rb

@@ -14,8 +14,13 @@ module ActiveAdmin
       # The resource which initiated this relationship
       attr_reader :owner
 
+      # The name of the relation
+      attr_reader :target_name
+
       def initialize(owner, target_name, options = {})
-        @owner, @target_name, @options = owner, target_name, options
+        @owner = owner
+        @target_name = target_name
+        @options = options
       end
 
       # Returns the target resource class or raises an exception if it doesn't exist

data/lib/active_admin/resource/menu.rb

@@ -26,9 +26,9 @@ module ActiveAdmin
         resource = self
         {
           id: resource_name.plural,
-          label: proc{ resource.plural_resource_label },
-          url:   proc{ resource.route_collection_path(params, url_options) },
-          if:    proc{ authorized?(Auth::READ, menu_resource_class) }
+          label: proc { resource.plural_resource_label },
+          url:   proc { resource.route_collection_path(params, url_options) },
+          if:    proc { authorized?(Auth::READ, menu_resource_class) }
         }
       end
 

data/lib/active_admin/resource/model.rb

@@ -0,0 +1,15 @@
+module ActiveAdmin
+  class Model
+    def initialize(resource, record)
+      @record = record
+
+      if resource
+        @record.extend(resource.resource_name_extension)
+      end
+    end
+
+    def to_model
+      @record
+    end
+  end
+end

data/lib/active_admin/resource/naming.rb

@@ -22,8 +22,8 @@ module ActiveAdmin
 
       # Returns the plural version of this resource such as "Bank Accounts"
       def plural_resource_label(options = {})
-        defaults = {count:   Helpers::I18n::PLURAL_MANY_COUNT,
-                    default: resource_label.pluralize.titleize}
+        defaults = { count:   Helpers::I18n::PLURAL_MANY_COUNT,
+                    default: resource_label.pluralize.titleize }
         resource_name.translate defaults.merge options
       end
 
@@ -46,7 +46,7 @@ module ActiveAdmin
       end
 
       def translate(options = {})
-        I18n.t i18n_key, {scope: [:activerecord, :models]}.merge(options)
+        I18n.t i18n_key, { scope: [:activerecord, :models] }.merge(options)
       end
 
       def route_key