activeadmin 0.5.1 → 0.6.0

data/lib/active_admin/dashboards/dashboard_controller.rb

@@ -39,7 +39,7 @@ module ActiveAdmin
 
       # Return the current menu for the view. This is a helper method
       def current_menu
-        active_admin_namespace.menu
+        active_admin_namespace.fetch_menu(:default)
       end
 
       def active_admin_namespace

data/lib/active_admin/devise.rb

@@ -21,7 +21,8 @@ module ActiveAdmin
     def self.controllers
       {
         :sessions => "active_admin/devise/sessions",
-        :passwords => "active_admin/devise/passwords"
+        :passwords => "active_admin/devise/passwords",
+        :unlocks => "active_admin/devise/unlocks"
       }
     end
 
@@ -34,12 +35,22 @@ module ActiveAdmin
 
       # Redirect to the default namespace on logout
       def root_path
-        (Rails.configuration.action_controller[:relative_url_root] || '') +
-        if ActiveAdmin.application.default_namespace
-          "/#{ActiveAdmin.application.default_namespace}"
-        else
-          "/"
-        end
+        namespace = ActiveAdmin.application.default_namespace.presence
+        root_path_method = [namespace, :root_path].compact.join('_')
+
+        url_helpers = Rails.application.routes.url_helpers
+
+        path = if url_helpers.respond_to? root_path_method
+                 url_helpers.send root_path_method
+               else
+                 # Guess a root_path when url_helpers not helpful
+                 "/#{namespace}"
+               end
+
+        # NOTE: `relative_url_root` is deprecated by rails.
+        #       Remove prefix here if it is removed completely.
+        prefix = Rails.configuration.action_controller[:relative_url_root] || ''
+        prefix + path
       end
     end
 
@@ -51,5 +62,9 @@ module ActiveAdmin
       include ::ActiveAdmin::Devise::Controller
     end
 
+    class UnlocksController < ::Devise::UnlocksController
+      include ::ActiveAdmin::Devise::Controller
+    end
+
   end
 end

data/lib/active_admin/dsl.rb

@@ -86,7 +86,7 @@ module ActiveAdmin
     def action_item(options = {}, &block)
       config.add_action_item(options, &block)
     end
-    
+
     # Add a new batch action item to the resource
     # Provide a symbol/string to register the action, options, & block to execute on request
     # 
@@ -99,7 +99,6 @@ module ActiveAdmin
     # => :confirm is a string which the user will have to accept in order to process the action
     #
     def batch_action(title, options = {}, &block)
-      
       # Create symbol & title information
       if title.is_a?( String )
         sym = title.titleize.gsub(' ', '').underscore.to_sym
@@ -114,13 +113,27 @@ module ActiveAdmin
       else
         config.remove_batch_action sym
       end
-      
     end
 
+    # Set the options that are available for the item that will be placed in the global
+    # navigation of the menu.
     def menu(options = {})
-      config.menu(options)
+      config.menu_item_options = options
     end
-    
+
+    # Set the name of the navigation menu to display. This is mainly used in conjuction with the
+    # `#belongs_to` functionality.
+    #
+    # @param [Symbol] menu_name The name of the menu to display as the global navigation
+    #                 when viewing this resource. Defaults to a menu named `:default`.
+    #
+    # Pass a block returning the name of a menu you want rendered for the request, being
+    # executed in the context of the controller
+    #
+    def navigation_menu(menu_name=nil, &block)
+      config.navigation_menu_name = menu_name || block
+    end
+
     # Rewrite breadcrumb links.
     # Block will be executed inside controller.
     # Block must return an array if you want to rewrite breadcrumb links.

data/lib/active_admin/engine.rb

@@ -1,7 +1,7 @@
 module ActiveAdmin
   class Engine < Rails::Engine
     if Rails.version > "3.1"
-      initializer "ActiveAdmin precompile hook" do |app|
+      initializer "ActiveAdmin precompile hook", :group => :all do |app|
         app.config.assets.precompile += %w(active_admin.js active_admin.css active_admin/print.css)
       end
     end

data/lib/active_admin/filters/dsl.rb

@@ -7,7 +7,7 @@ module ActiveAdmin
         config.add_filter(attribute, options)
       end
 
-      # For docs, please see ActiveAdmin::Filters::ResourceExtension#delete_filter
+      # For docs, please see ActiveAdmin::Filters::ResourceExtension#remove_filter
       def remove_filter(attribute)
         config.remove_filter(attribute)
       end

data/lib/active_admin/filters/forms.rb

@@ -6,9 +6,8 @@ module ActiveAdmin
     class FormBuilder < ::ActiveAdmin::FormBuilder
 
       def filter(method, options = {})
-        return "" if method.blank?
-        options[:as] ||= default_input_type(method)
-        return "" unless options[:as]
+        return "" if method.blank? ||
+                     (options[:as] ||= default_input_type(method)).nil?
         content = input(method, options)
         form_buffers.last << content.html_safe if content
       end
@@ -73,10 +72,13 @@ module ActiveAdmin
         options[:as] = :q
         clear_link = link_to(I18n.t('active_admin.clear_filters'), "#", :class => "clear_filters_btn")
         form_for search, options do |f|
-          filters.each do |filter_options|
-            filter_options = filter_options.dup
-            attribute = filter_options.delete(:attribute)
-            f.filter attribute, filter_options
+          filters.group_by{ |o| o[:attribute] }.each do |attribute, array|
+            options      = array.last # grab last-defined `filter` call from DSL
+            if_block     = options[:if]     || proc{ true }
+            unless_block = options[:unless] || proc{ false }
+            if call_method_or_proc_on(self, if_block) && !call_method_or_proc_on(self, unless_block)
+              f.filter options[:attribute], options.except(:attribute, :if, :unless)
+            end
           end
 
           buttons = content_tag :div, :class => "buttons" do

data/lib/active_admin/filters/resource_extension.rb

@@ -14,16 +14,7 @@ module ActiveAdmin
       # @return [Array] Filters that apply for this resource
       def filters
         return [] unless filters_enabled?
-
-        if @filters.present?
-          if preserve_default_filters?
-            @filters + default_filters
-          else
-            @filters
-          end
-        else
-          default_filters
-        end
+        filter_lookup
       end
 
       # Setter to enable / disable filters on this resource.
@@ -55,9 +46,8 @@ module ActiveAdmin
           raise RuntimeError, "Can't remove a filter when filters are disabled. Enable filters with 'config.filters = true'"
         end
 
-        @filters ||= default_filters
-
-        @filters.delete_if { |f| f.fetch(:attribute) == attribute }
+        @filters_to_remove ||= []
+        @filters_to_remove << attribute
       end
 
       # Add a filter for this resource. If filters are not enabled, this method
@@ -72,18 +62,33 @@ module ActiveAdmin
         end
 
         @filters ||= []
-
         @filters << options.merge({ :attribute => attribute })
       end
 
       # Reset the filters to use defaults
       def reset_filters!
         @filters = nil
+        @filters_to_remove = nil
       end
 
       private
 
-      # @return [Array] The array of default for filters for this resource
+      # Collapses the waveform, if you will, of which filters should be displayed.
+      # Removes filters and adds in default filters as desired.
+      def filter_lookup
+        filters = @filters.try(:dup) || []
+        filters.push *default_filters if filters.empty? || preserve_default_filters?
+
+        if @filters_to_remove
+          @filters_to_remove.each do |attr|
+            filters.delete_if{ |f| f.fetch(:attribute) == attr }
+          end
+        end
+
+        filters
+      end
+
+      # @return [Array] The array of default filters for this resource
       def default_filters
         default_association_filters + default_content_filters
       end

data/lib/active_admin/form_builder.rb

@@ -9,37 +9,31 @@ module ActiveAdmin
     end
 
     def inputs(*args, &block)
-      # Store that we are creating inputs without a block
-      @inputs_with_block = block_given? ? true : false
-      content = with_new_form_buffer { super }
-      form_buffers.last << content.html_safe
+      @inputs_with_block = block_given?
+      form_buffers.last << with_new_form_buffer{ super }
     end
 
-    # The input method returns a properly formatted string for
-    # its contents, so we want to skip the internal buffering
-    # while building up its contents
+    # If this `input` call is inside a `inputs` block, add the content
+    # to the form buffer. Else, return it directly.
     def input(method, *args)
-      content = with_new_form_buffer { super }
-      return content.html_safe unless @inputs_with_block
-      form_buffers.last << content.html_safe
+      content = with_new_form_buffer{ super }
+      @inputs_with_block ? form_buffers.last << content : content
     end
 
-    def cancel_link(url = nil, html_options = {}, li_attributes = {})
-      li_attributes[:class] ||= "cancel"
-      url ||= {:action => "index"}
-      form_buffers.last << template.content_tag(:li, (template.link_to I18n.t('active_admin.cancel'), url, html_options), li_attributes)
+    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
+      form_buffers.last << template.content_tag(:li, li_content, li_attrs)
     end
 
     def actions(*args, &block)
-      content = with_new_form_buffer do
-        block_given? ? super : super { commit_action_with_cancel_link }
+      form_buffers.last << with_new_form_buffer do
+        block_given? ? super : super{ commit_action_with_cancel_link }
       end
-      form_buffers.last << content.html_safe
     end
 
     def action(*args)
-      content = with_new_form_buffer { super }
-      form_buffers.last << content.html_safe
+      form_buffers.last << with_new_form_buffer{ super }
     end
 
     def commit_action_with_cancel_link
@@ -71,21 +65,18 @@ module ActiveAdmin
         contents
       end
 
-      content = with_new_form_buffer do
+      form_buffers.last << with_new_form_buffer do
         template.content_tag :div, :class => "has_many #{association}" do
           form_buffers.last << template.content_tag(:h3, object.class.reflect_on_association(association).klass.model_name.human(:count => 1.1))
           inputs options, &form_block
 
-          js = js_for_has_many(association, form_block, template)
-          form_buffers.last << js.html_safe
+          form_buffers.last << js_for_has_many(association, form_block, template)
         end
       end
-      form_buffers.last << content.html_safe
     end
-    
+
     def semantic_errors(*args)
-      content = with_new_form_buffer { super }
-      form_buffers.last << content.html_safe unless content.nil?
+      form_buffers.last << with_new_form_buffer{ super }
     end
 
     # These methods are deprecated and removed from Formtastic, however are
@@ -135,9 +126,9 @@ module ActiveAdmin
       if ::Object.const_defined?(input_class_name)
         input_class_name.constantize
       elsif ActiveAdmin::Inputs.const_defined?(input_class_name)
-        active_admin_input_class_name(as).constantize 
+        active_admin_input_class_name(as).constantize
       elsif Formtastic::Inputs.const_defined?(input_class_name)
-        standard_input_class_name(as).constantize 
+        standard_input_class_name(as).constantize
       else
         raise Formtastic::UnknownInputError
       end
@@ -160,36 +151,40 @@ module ActiveAdmin
       raise Formtastic::UnknownInputError
     end
 
+    # This method calls the block it's passed (in our case, the `f.inputs` block)
+    # and wraps the resulting HTML in a fieldset. If your block happens to return
+    # nil (but it otherwise built the form correctly), the below override passes
+    # the most recent part of the Active Admin form buffer.
+    def field_set_and_list_wrapping(*args, &block)
+      block_given? ? super{ yield || form_buffers.last } : super
+    end
+
     private
 
     def with_new_form_buffer
-      form_buffers << "".html_safe
-      return_value = yield
+      form_buffers << ''.html_safe
+      return_value = (yield || '').html_safe
       form_buffers.pop
       return_value
     end
 
     # Capture the ADD JS
     def js_for_has_many(association, form_block, template)
-      association_reflection = object.class.reflect_on_association(association)
-      association_human_name = association_reflection.klass.model_name.human
-      placeholder = "NEW_#{association_human_name.upcase.split(' ').join('_')}_RECORD"
-
-      js = with_new_form_buffer do
-        inputs_for_nested_attributes :for => [association, association_reflection.klass.new],
-                                     :class => "inputs has_many_fields",
-                                     :for_options => { :child_index => placeholder },
-                                     &form_block
-      end
-
-      js = template.escape_javascript(js)
-
-      text = I18n.t 'active_admin.has_many_new', :model => association_human_name
-      onclick = "$(this).siblings('li.input').append('#{js}'.replace(/#{placeholder}/g, new Date().getTime())); return false;"
-
-      template.link_to text, "#",
-                       :onclick => onclick,
-                       :class => "button"
+      assoc_reflection = object.class.reflect_on_association(association)
+      assoc_name       = assoc_reflection.klass.model_name
+      placeholder      = "NEW_#{assoc_name.upcase.split(' ').join('_')}_RECORD"
+      opts = {
+        :for         => [association, assoc_reflection.klass.new],
+        :class       => "inputs has_many_fields",
+        :for_options => { :child_index => placeholder }
+      }
+      js = with_new_form_buffer{ inputs_for_nested_attributes opts, &form_block }
+      js = template.escape_javascript js
+
+      onclick = "$(this).before('#{js}'.replace(/#{placeholder}/g, new Date().getTime())); return false;"
+      text    = I18n.t 'active_admin.has_many_new', :model => assoc_name.human
+
+      template.link_to(text, "#", :onclick => onclick, :class => "button").html_safe
     end
 
   end

data/lib/active_admin/helpers/optional_display.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
-  
+
   # Shareable module to give a #display_on?(action) method
   # which returns true or false depending on an options hash.
   #
@@ -23,7 +23,7 @@ module ActiveAdmin
         when Symbol, String
           render_context ? render_context.send(symbol_or_proc) : self.send(symbol_or_proc)
         when Proc
-            render_context ? render_context.instance_exec(&symbol_or_proc) : instance_exec(&symbol_or_proc)
+          render_context ? render_context.instance_exec(&symbol_or_proc) : instance_exec(&symbol_or_proc)
         else symbol_or_proc
         end
       end
@@ -33,12 +33,8 @@ module ActiveAdmin
     private
 
     def normalize_display_options!
-      if @options[:only]
-        @options[:only] = @options[:only].is_a?(Array) ? @options[:only] : [@options[:only]]
-      end
-      if @options[:except]
-        @options[:except] = @options[:except].is_a?(Array) ? @options[:except] : [@options[:except]]
-      end
+      @options[:only] = Array(@options[:only]) if @options[:only]
+      @options[:except] = Array(@options[:except]) if @options[:except]
     end
   end
 end

data/lib/active_admin/inputs/filter_boolean_input.rb

@@ -32,7 +32,7 @@ module ActiveAdmin
       end
 
       def metasearch_conditions
-        /is_true|is_false|is_present/
+        /(is_true|is_false|is_present|is_blank|is_null|is_not_null)$/
       end
 
     end

data/lib/active_admin/inputs/filter_string_input.rb

@@ -15,7 +15,11 @@ module ActiveAdmin
       end
 
       def input_name
-        "#{super}_contains"
+        method.to_s.match(metasearch_conditions) ? method : "#{method}_contains"
+      end
+
+      def metasearch_conditions
+        /starts_with|ends_with/
       end
     end
   end

data/lib/active_admin/locales/bg.yml

@@ -3,7 +3,7 @@ bg:
     dashboard: Табло
     dashboard_welcome:
       welcome: "Добре дошли в Active Admin. Това е таблото по подразбиране."
-      call_to_action: "За да добавите секции, проверете 'app/admin/dashboards.rb'"
+      call_to_action: "За да добавите секции, проверете 'app/admin/dashboard.rb'"
     view: "Преглед"
     edit: "Редакция"
     delete: "Изтриване"

data/lib/active_admin/locales/ca.yml

@@ -4,7 +4,7 @@ ca:
     dashboard: Tauler
     dashboard_welcome:
       welcome: "Benvingut a Active Admin. Aquest és el tauler per defecte."
-      call_to_action: "Mira l'arxiu 'app/admin/dashboards.rb' per afegir seccions al tauler"
+      call_to_action: "Mira l'arxiu 'app/admin/dashboard.rb' per afegir seccions al tauler"
     view: "Mostra"
     edit: "Edita"
     delete: "Elimina"

data/lib/active_admin/locales/cs.yml

@@ -3,15 +3,15 @@ cs:
     dashboard: Úvod
     dashboard_welcome:
       welcome: "Vítejte v Active Admin. Toto je nástěnka."
-      call_to_action: "Pro přidání sekcí nástěnky se podívejte do 'app/admin/dashboards.rb'"
+      call_to_action: "Pro přidání sekcí nástěnky se podívejte do 'app/admin/dashboard.rb'"
     view: "Zobrazit"
     edit: "Upravit"
     delete: "Smazat"
     delete_confirmation: "Jste si jistí, že chcete tuto položku smazat?"
-    new_model: "Nový"
-    create_model: "Nový"
+    new_model: "Vytvořit"
+    create_model: "Vytvořit %{model}"
     edit_model: "Upravit"
-    update_model: "Upravit"
+    update_model: "Upravit %{model}"
     delete_model: "Smazat"
     details: "Detaily"
     cancel: "Zrušit"
@@ -21,17 +21,17 @@ cs:
     download: "Stáhnout:"
     has_many_new: "Přidat nový"
     has_many_delete: "Odstranit"
-    filter: "Filtr"
+    filter: "Filtrovat"
     clear_filters: "Vyčistit filtry"
-    search_field: "%{field}"
+    search_field: "Prohledat %{field}"
     equal_to: "Přesně"
     greater_than: "Větší než"
     less_than: "Menší než"
     main_content: "Prosím implementujte %{model}#main_content pro zobrazení obsahu."
     logout: "Odhlášení"
-    powered_by: "Powered by %{active_admin} %{version}"
+    powered_by: "%{active_admin} %{version}"
     sidebars:
-      filters: "Filtr"
+      filters: "Filtry"
     pagination:
       empty: "Nenalezen."
       one: "Zobrazena  <b>1</b> položka"
@@ -39,37 +39,39 @@ cs:
       multiple: "<b>%{from}&nbsp;-&nbsp;%{to}</b> z <b>%{total}</b>"
       entry:
         one: "položka"
+        few: "položky"
         other: "položky"
     any: "Kterákoliv"
     blank_slate:
       content: "Zatím zde není žádný obsah."
       link: "Vytvořit"
     batch_actions:
-      button_label: "dávkové Akce"
-      delete_confirmation: "Jste si jisti, že chcete odstranit tyto %{plural_model}? Nebudete moci vrátit zpět to."
+      button_label: "Hromadné akce"
+      delete_confirmation: "Jste si jisti, že chcete odstranit tyto %{plural_model}?"
       succesfully_destroyed:
-        one: "úspěšně zničil 1 %{model}"
-        other: "úspěšně zničil %{count} %{plural_model}"
+        one: "Úspěšně smazán %{model}"
+        few: "Úspěšně smazány %{count} %{plural_model}"
+        other: "Úspěšně smazáno %{count} %{plural_model}"
       selection_toggle_explanation: "(Změnit výběr)"
-      link: "vytvořit jeden"
-      action_label: "%{title} vybraný"
+      link: "Vytvořit"
+      action_label: "%{title}"
       labels:
-        destroy: "vymazat"
+        destroy: "Vymazat"
     comments:
-      body: "tělo"
-      author: "autor"
-      title: "komentář"
+      body: "Tělo"
+      author: "Autor"
+      title: "Komentář"
       add: "Přidat komentář"
-      resource: "zdroj"
-      no_comments_yet: "Žádný nový komentář"
-      title_content: "Komentáře (%{count})"
+      resource: "Zdroj"
+      no_comments_yet: "Žádný komentář"
+      title_content: "Komentáře administrátorů (%{count})"
       errors:
         empty_text: "Komentář nebyl uložen, je prázdný."
     devise:
       login:
-        title: "přihlášení"
-        remember_me: "Zapamatuj si mě"
-        submit: "přihlášení"
+        title: "Přihlášení"
+        remember_me: "Zapamatovat si mě"
+        submit: "Přihlásit"
       reset_password:
         title: "Zapomněli jste heslo?"
         submit: "Obnovit heslo"
@@ -79,4 +81,3 @@ cs:
       links:
         sign_in: "Přihlásit se"
         forgot_your_password: "Zapomněli jste heslo?"
-