activeadmin 0.5.0 → 0.5.1

data/lib/active_admin/filters/dsl.rb

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

data/lib/active_admin/filters/forms.rb

@@ -28,6 +28,8 @@ module ActiveAdmin
             return :numeric
           when :float, :decimal
             return :numeric
+          when :boolean
+            return :boolean
           end
         end
 

data/lib/active_admin/filters/resource_extension.rb

@@ -15,7 +15,15 @@ module ActiveAdmin
       def filters
         return [] unless filters_enabled?
 
-        @filters || default_filters
+        if @filters.present?
+          if preserve_default_filters?
+            @filters + default_filters
+          else
+            @filters
+          end
+        else
+          default_filters
+        end
       end
 
       # Setter to enable / disable filters on this resource.
@@ -30,11 +38,33 @@ module ActiveAdmin
         @filters_enabled.nil? ? namespace.filters : @filters_enabled
       end
 
+      def preserve_default_filters!
+        @preserve_default_filters = true
+      end
+
+      def preserve_default_filters?
+        @preserve_default_filters == true
+      end
+
+      # Remove a filter for this resource. If filters are not enabled, this method
+      # will raise a RuntimeError
+      #
+      # @param [Symbol] attribute The attribute to not filter on
+      def remove_filter(attribute)
+        unless filters_enabled?
+          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 }
+      end
+
       # Add a filter for this resource. If filters are not enabled, this method
       # will raise a RuntimeError
       #
       # @param [Symbol] attribute The attribute to filter on
-      # @param [Hash] options The set of options that are passed through to 
+      # @param [Hash] options The set of options that are passed through to
       #                       metasearch for the field definition.
       def add_filter(attribute, options = {})
         unless filters_enabled?

data/lib/active_admin/form_builder.rb

@@ -76,23 +76,17 @@ module ActiveAdmin
           form_buffers.last << template.content_tag(:h3, object.class.reflect_on_association(association).klass.model_name.human(:count => 1.1))
           inputs options, &form_block
 
-          # Capture the ADD JS
-          js = with_new_form_buffer do
-            inputs_for_nested_attributes  :for => [association, object.class.reflect_on_association(association).klass.new],
-                                          :class => "inputs has_many_fields",
-                                          :for_options => {
-                                            :child_index => "NEW_RECORD"
-                                          }, &form_block
-          end
-
-          js = template.escape_javascript(js)
-          js = template.link_to I18n.t('active_admin.has_many_new', :model => object.class.reflect_on_association(association).klass.model_name.human), "#", :onclick => "$(this).before('#{js}'.replace(/NEW_RECORD/g, new Date().getTime())); return false;", :class => "button"
-
+          js = js_for_has_many(association, form_block, template)
           form_buffers.last << js.html_safe
         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?
+    end
 
     # These methods are deprecated and removed from Formtastic, however are
     # supported here to help with transition.
@@ -175,5 +169,28 @@ module ActiveAdmin
       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"
+    end
+
   end
 end

data/lib/active_admin/inputs.rb

@@ -10,5 +10,6 @@ module ActiveAdmin
     autoload :FilterNumericInput
     autoload :FilterSelectInput
     autoload :FilterCheckBoxesInput
+    autoload :FilterBooleanInput
   end
 end

data/lib/active_admin/inputs/filter_boolean_input.rb

@@ -0,0 +1,40 @@
+module ActiveAdmin
+  module Inputs
+    class FilterBooleanInput < ::Formtastic::Inputs::BooleanInput
+      include FilterBase
+
+      def to_html
+        input_wrapping do 
+          [ label_html,
+            check_box_html
+          ].join("\n").html_safe
+        end
+      end
+
+      def check_box_html
+        template.check_box_tag("#{object_name}[#{method}]", checked_value, checked?, input_html_options)
+      end
+
+      def search_method
+        method.to_s.match(metasearch_conditions) ? method : "#{method}_eq"
+      end
+
+      def checked?
+        if defined? ActionView::Helpers::InstanceTag
+          object && ActionView::Helpers::InstanceTag.check_box_checked?(object.send(search_method), checked_value)
+        else
+          object && boolean_checked?(object.send(search_method), checked_value)
+        end
+      end
+
+      def input_html_options
+        { :name => "q[#{search_method}]" }
+      end
+
+      def metasearch_conditions
+        /is_true|is_false|is_present/
+      end
+
+    end
+  end
+end

data/lib/active_admin/inputs/filter_select_input.rb

@@ -12,7 +12,11 @@ module ActiveAdmin
       end
 
       def method
-        super.to_s.sub(/_id$/,'').to_sym
+        if super.to_s.scan(/_id/).count('_id') == 1
+          super.to_s.sub(/_id$/, '').to_sym
+        else
+          super.to_s.to_sym
+        end
       end
 
       def extra_input_html_options

data/lib/active_admin/locales/bg.yml

@@ -27,6 +27,7 @@ bg:
     less_than: "По-малко от"
     main_content: "Моля, приложи %{model}#main_content за визуализация на съдържанието."
     logout: "Изход"
+    powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Филтри"
     pagination:

data/lib/active_admin/locales/ca.yml

@@ -28,6 +28,7 @@ ca:
     less_than: "Més petit que"
     main_content: "Implementa %{model}#main_content per mostrar contingut."
     logout: "Desconnecta't"
+    powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Filtres"
     pagination:

data/lib/active_admin/locales/cs.yml

@@ -1,13 +1,17 @@
 cs:
   active_admin:
     dashboard: Úvod
-    dashboard_welcome: "Vítejte v Active Admin. Toto je nástěnka. Pro přidání sekcí nástěnky se podívejte do 'app/admin/dashboards.rb'"
+    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'"
     view: "Zobrazit"
     edit: "Upravit"
     delete: "Smazat"
     delete_confirmation: "Jste si jistí, že chcete tuto položku smazat?"
     new_model: "Nový"
+    create_model: "Nový"
     edit_model: "Upravit"
+    update_model: "Upravit"
     delete_model: "Smazat"
     details: "Detaily"
     cancel: "Zrušit"
@@ -25,6 +29,7 @@ cs:
     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}"
     sidebars:
       filters: "Filtr"
     pagination:
@@ -32,6 +37,9 @@ cs:
       one: "Zobrazena  <b>1</b> položka"
       one_page: "Počet zobrazených položek %{n}"
       multiple: "<b>%{from}&nbsp;-&nbsp;%{to}</b> z <b>%{total}</b>"
+      entry:
+        one: "položka"
+        other: "položky"
     any: "Kterákoliv"
     blank_slate:
       content: "Zatím zde není žádný obsah."

data/lib/active_admin/locales/da.yml

@@ -27,6 +27,7 @@ da:
     less_than: "mindre end"
     main_content: "Implementer venligst %{model}#main_content for at vise noget indhold."
     logout: "Log ud"
+    powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Filtre"
     pagination:

data/lib/active_admin/locales/de.yml

@@ -11,6 +11,7 @@ de:
     new_model: "%{model} erstellen"
     create_model: "%{model} erstellen"
     edit_model: "%{model} bearbeiten"
+    update_model: "%{model} bearbeiten"
     delete_model: "%{model} löschen"
     details: "%{model} Details"
     cancel: "Abbrechen"
@@ -28,6 +29,7 @@ de:
     less_than: "Kleiner als"
     main_content: "Bitte implementieren Sie %{model}#main_content, um Inhalte anzuzeigen."
     logout: "Abmelden"
+    powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Filter"
     pagination:
@@ -42,6 +44,17 @@ de:
     blank_slate:
       content: "Es gibt noch keine %{resource_name}."
       link: "Erstellen"
+    batch_actions:
+      button_label: "Stapelverarbeitung"
+      delete_confirmation: "Sind Sie sicher dass sie diese %{plural_model} löschen wollen? Dies kann nicht rückgängig gemacht werden"
+      succesfully_destroyed:
+        one: "Erfolgreich 1 %{model} gelöscht"
+        other: "Erfolgreich %{count} %{plural_model} gelöscht"
+      selection_toggle_explanation: "(Auswahl umschalten)"
+      link: "erstellen"
+      action_label: "%{title} ausgewählte"
+      labels:
+        destroy: "Lösche"
     comments:
       body: "Inhalt"
       author: "Autor"
@@ -68,7 +81,7 @@ de:
         forgot_your_password: "Passwort vergessen?"
   activerecord:
     attributes:
-      admin_user: 
+      admin_user:
         id: ID
         email: E-Mail
         encrypted_Password: Verschlüsseltes Passwort
@@ -85,8 +98,8 @@ de:
     models:
       admin_user:
         one: Administrator
-        other: Administratoren  
-  devise:      
+        other: Administratoren
+  devise:
     failure:
       admin_user:
         invalid: Benutzername oder Kennwort nicht korrekt.

data/lib/active_admin/locales/en.yml

@@ -29,6 +29,7 @@ en:
     less_than: "Less Than"
     main_content: "Please implement %{model}#main_content to display content."
     logout: "Logout"
+    powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Filters"
     pagination:

data/lib/active_admin/locales/es.yml

@@ -29,6 +29,7 @@ es:
     less_than: "Menor que"
     main_content: "Por favor implemente %{model}#main_content para mostrar contenido."
     logout: "Salir"
+    powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Filtros"
     pagination:

data/lib/active_admin/locales/fr.yml

@@ -29,6 +29,7 @@ fr:
     less_than: "Plus petit que"
     main_content: "Veuillez implémenter %{model}#main_content pour afficher le contenu."
     logout: "Déconnexion"
+    powered_by: "Propulsé par %{active_admin} %{version}"
     sidebars:
       filters: "Filtres"
     pagination:
@@ -51,7 +52,10 @@ fr:
         other: "%{count} %{plural_model} supprimés"
       selection_toggle_explanation: "(Inverser la sélection)"
       link: "Créer un"
-    comments:    
+      action_label: "%{title} les éléments sélectionnés"
+      labels:
+        destroy: "Supprimer"
+    comments:
       body: "Corps"
       author: "Auteur"
       title: "Commentaire"

data/lib/active_admin/locales/he.yml

@@ -19,7 +19,7 @@ he:
     previous: "הקודם"
     next: "הבא"
     download: "הורד:"
-    has_many_new: "הוספת %{model חדש}"
+    has_many_new: "הוספת %{model} חדש"
     has_many_delete: "מחיקה"
     filter: "סינון"
     clear_filters: "איפוס שדות"
@@ -27,8 +27,9 @@ he:
     equal_to: "שווה ל"
     greater_than: "גדול מ"
     less_than: "פחות מ"
-    main_content: "יש ליישם את התוכן של %{כדי להציג אותו כאן content."
+    main_content: "Please implement %{model}#main_content to display content."
     logout: "התנתקות"
+    powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "סינון"
     pagination:

data/lib/active_admin/locales/hr.yml

@@ -29,6 +29,7 @@ hr:
     less_than: "Manje Od"
     main_content: "Molim Vas, implementirajte %{model}#main_content da bi ste prikazali sadržaj."
     logout: "Odjavi se"
+    powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Filtriranje"
     pagination:

data/lib/active_admin/locales/hu.yml

@@ -29,6 +29,7 @@ hu:
     less_than: "Kisebb, mint"
     main_content: "Kérem, implementálja a %{model}#main_content metódust a tartalom megjelenítéséhez."
     logout: "Kilépés"
+    powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Szűrők"
     pagination:

data/lib/active_admin/locales/it.yml

@@ -13,12 +13,12 @@ it:
     edit_model: "Modifica %{model}"
     update_model: "Modifica %{model}"
     delete_model: "Rimuovi %{model}"
-    details: "%{model} Dettagli"
+    details: "Dettagli %{model}"
     cancel: "Annulla"
     empty: "Vuoto"
     previous: "Precedente"
     next: "Prossimo"
-    download: "Download:"
+    download: "Scarica:"
     has_many_new: "Aggiungi nuovo/a %{model}"
     has_many_delete: "Rimuovi"
     filter: "Filtra"
@@ -29,6 +29,7 @@ it:
     less_than: "Minore di"
     main_content: "Devi implemetare %{model}#main_content per mostrarne il contenuto."
     logout: "Esci"
+    powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Filtri"
     pagination:
@@ -44,7 +45,7 @@ it:
       content: "Non sono presenti %{resource_name}"
       link: "Crea nuovo/a"
     batch_actions:
-      button_label: "Azioni Batch"
+      button_label: "Azioni multiple"
       delete_confirmation: "Sei sicuro di volere cancellare %{plural_model}? Non sarà possibile annulare questa modifica."
       succesfully_destroyed:
         one: "Eliminato con successo 1 %{model}"
@@ -77,4 +78,4 @@ it:
         submit: "Cambia la mia password"
       links:
         sign_in: "Entra"
-        forgot_your_password: "Dimenticato la password?"
+        forgot_your_password: "Dimenticato la password?"

data/lib/active_admin/locales/ja.yml

@@ -27,6 +27,7 @@ ja:
     less_than: "より小さい"
     main_content: "内容を表示するために %{model}#main_content を実装してください。"
     logout: "ログアウト"
+    powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "検索条件"
     pagination:
@@ -39,18 +40,18 @@ ja:
       content: "%{resource_name} はまだありません。"
       link: "作成する"
     batch_actions:
-      button_label: "バッチアクション"
-      delete_confirmation: "あなたはこれらを削除してもよろしいです %{plural_model}? あなたはこれを取り消すことはできません。"
+      button_label: "一括操作"
+      delete_confirmation: "%{plural_model} を削除してもよろしいですか? この操作は取り消すことができません。"
       succesfully_destroyed:
-        one: "首尾よく破壊された 1 %{model}"
-        other: "首尾よく破壊された %{count} %{plural_model}"
-      selection_toggle_explanation: "(トグルの選択)"
-      link: "作成する1"
-      action_label: "%{title} 選択した"
+        one: "1件の %{model} を削除しました"
+        other: "%{count}件の %{plural_model} を削除しました"
+      selection_toggle_explanation: "(選択)"
+      link: "作成する"
+      action_label: "選択した行を%{title}"
       labels:
         destroy: "削除する"
     comments:
-      body: "ボディ"
+      body: "本文"
       author: "作成者"
       title: "コメント"
       add: "コメントを追加"
@@ -58,19 +59,18 @@ ja:
       no_comments_yet: "コメントはまだありません。"
       title_content: "コメント (%{count})"
       errors:
-        empty_text: "コメントが保存されていない、テキストは空でした。"
+        empty_text: "テキストが空のため、コメントは保存されませんでした。"
     devise:
       login:
         title: "ログイン"
-        remember_me: "私を覚えている"
+        remember_me: "次回から自動的にログイン"
         submit: "ログイン"
       reset_password:
         title: "パスワードをお忘れですか？"
-        submit: "私のパスワードをリセットする"
+        submit: "パスワードをリセットする"
       change_password:
         title: "パスワードを変更する"
         submit: "パスワードを変更する"
       links:
         sign_in: "サインイン"
         forgot_your_password: "パスワードをお忘れですか？"
-