activeadmin 0.4.4 → 0.5.0.pre

data/lib/active_admin/form_builder.rb

@@ -24,28 +24,27 @@ module ActiveAdmin
       form_buffers.last << content.html_safe
     end
 
-    # The buttons method always needs to be wrapped in a new buffer
-    def buttons(*args, &block)
+    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)
+    end
+
+    def actions(*args, &block)
       content = with_new_form_buffer do
-        block_given? ? super : super { commit_button_with_cancel_link }
+        block_given? ? super : super { commit_action_with_cancel_link }
       end
       form_buffers.last << content.html_safe
     end
 
-    def commit_button(*args)
-      content = with_new_form_buffer{ super }
+    def action(*args)
+      content = with_new_form_buffer { super }
       form_buffers.last << content.html_safe
     end
 
-    def cancel_link(url = nil, html_options = {}, li_attributes = {})
-      li_attributes[:class] ||= "cancel"
-      url ||= {:action => "index"}
-      template.content_tag(:li, (template.link_to I18n.t('active_admin.cancel'), url, html_options), li_attributes)
-    end
-
-    def commit_button_with_cancel_link
-      content = commit_button
-      content << cancel_link
+    def commit_action_with_cancel_link
+      action(:submit)
+      cancel_link
     end
 
     def has_many(association, options = {}, &block)
@@ -55,17 +54,26 @@ module ActiveAdmin
 
       # Add Delete Links
       form_block = proc do |has_many_form|
-        block.call(has_many_form) + if has_many_form.object.new_record?
-                                      template.content_tag :li do
-                                        template.link_to I18n.t('active_admin.has_many_delete'), "#", :onclick => "$(this).closest('.has_many_fields').remove(); return false;", :class => "button"
-                                      end
-                                    else
-                                    end
+        # @see https://github.com/justinfrench/formtastic/blob/2.2.1/lib/formtastic/helpers/inputs_helper.rb#L373
+        contents = if block.arity == 1  # for backwards compatibility with REE & Ruby 1.8.x
+          block.call(has_many_form)
+        else
+          index = parent_child_index(options[:parent]) if options[:parent]
+          block.call(has_many_form, index)
+        end
+
+        if has_many_form.object.new_record?
+          contents += template.content_tag(:li) do
+            template.link_to I18n.t('active_admin.has_many_delete'), "#", :onclick => "$(this).closest('.has_many_fields').remove(); return false;", :class => "button"
+          end
+        end
+
+        contents
       end
 
       content = with_new_form_buffer do
         template.content_tag :div, :class => "has_many #{association}" do
-          form_buffers.last << template.content_tag(:h3, association.to_s.titlecase)
+          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
@@ -78,7 +86,7 @@ module ActiveAdmin
           end
 
           js = template.escape_javascript(js)
-          js = template.link_to I18n.t('active_admin.has_many_new', :model => association.to_s.singularize.titlecase), "#", :onclick => "$(this).before('#{js}'.replace(/NEW_RECORD/g, new Date().getTime())); return false;", :class => "button"
+          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"
 
           form_buffers.last << js.html_safe
         end
@@ -86,29 +94,76 @@ module ActiveAdmin
       form_buffers.last << content.html_safe
     end
 
+    # These methods are deprecated and removed from Formtastic, however are
+    # supported here to help with transition.
+    module DeprecatedMethods
+
+      # Formtastic has depreciated #commit_button in favor of #action(:submit)
+      def commit_button(*args)
+        ::ActiveSupport::Deprecation.warn("f.commit_button is deprecated in favour of f.action(:submit)")
+
+        options = args.extract_options!
+        if String === args.first
+          options[:label] = args.first unless options.has_key?(:label)
+        end
+
+        action(:submit, options)
+      end
+
+      def commit_button_with_cancel_link
+        # Formtastic has depreciated #buttons in favor of #actions
+        ::ActiveSupport::Deprecation.warn("f.commit_button_with_cancel_link is deprecated in favour of f.commit_action_with_cancel_link")
+
+        commit_action_with_cancel_link
+      end
+
+      # The buttons method always needs to be wrapped in a new buffer
+      def buttons(*args, &block)
+        # Formtastic has depreciated #buttons in favor of #actions
+        ::ActiveSupport::Deprecation.warn("f.buttons is deprecated in favour of f.actions")
+
+        actions args, &block
+      end
+
+    end
+    include DeprecatedMethods
+
     protected
 
     def active_admin_input_class_name(as)
       "ActiveAdmin::Inputs::#{as.to_s.camelize}Input"
     end
 
-    def input_class(as)
-      @input_classes_cache ||= {}
-      @input_classes_cache[as] ||= begin
+    # prevent exceptions in production environment for better performance
+    def input_class_with_const_defined(as)
+      input_class_name = custom_input_class_name(as)
+
+      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 
+      elsif Formtastic::Inputs.const_defined?(input_class_name)
+        standard_input_class_name(as).constantize 
+      else
+        raise Formtastic::UnknownInputError
+      end
+    end
+
+    # use auto-loading in development environment
+    def input_class_by_trying(as)
+      begin
         begin
+          custom_input_class_name(as).constantize
+        rescue NameError
           begin
-            custom_input_class_name(as).constantize
+            active_admin_input_class_name(as).constantize
           rescue NameError
-            begin
-              active_admin_input_class_name(as).constantize
-            rescue NameError
-              standard_input_class_name(as).constantize
-            end
+            standard_input_class_name(as).constantize
           end
-        rescue NameError
-          raise Formtastic::UnknownInputError
         end
       end
+    rescue NameError
+      raise Formtastic::UnknownInputError
     end
 
     private

data/lib/active_admin/helpers/collection.rb

@@ -0,0 +1,23 @@
+module ActiveAdmin
+  module Helpers
+    module Collection
+      # Works around this issue: https://github.com/rails/rails/issues/7121
+      #
+      # GROUP BY + COUNT drops SELECT statement. This leads to SQL error when
+      # the ORDER statement mentions a column defined in the SELECT statement.
+      #
+      # We remove the ORDER statement to work around this issue.
+      def collection_size(collection=collection)
+        size = collection.reorder("").count
+        # when GROUP BY is used, AR returns Hash instead of Fixnum for .size
+        size = size.size if size.kind_of?(Hash)
+
+        size
+      end
+
+      def collection_is_empty?(collection=collection)
+        collection_size(collection) == 0
+      end
+    end
+  end
+end

data/lib/active_admin/helpers/optional_display.rb

@@ -21,7 +21,7 @@ module ActiveAdmin
         symbol_or_proc = @options[:if]
         return case symbol_or_proc
         when Symbol, String
-          self.send(symbol_or_proc)
+          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)
         else symbol_or_proc

data/lib/active_admin/inputs/filter_select_input.rb

@@ -12,7 +12,7 @@ module ActiveAdmin
       end
 
       def method
-        super.to_s.gsub('_id','').to_sym
+        super.to_s.sub(/_id$/,'').to_sym
       end
 
       def extra_input_html_options

data/lib/active_admin/locales/bg.yml

@@ -37,4 +37,40 @@ bg:
     any: "Всеки"
     blank_slate:
       content: "Няма %{resource_name} все още."
-      link: "Създай връзка"
+      link: "Създай връзка"
+    batch_actions:
+      button_label: "партиди Действия"
+      delete_confirmation: "Сигурни ли сте че искате да изтриете тези %{plural_model}? Вие няма да можете да отмените това."
+      succesfully_destroyed:
+        one: "Успешно унищожени 1 %{model}"
+        other: "Успешно унищожени %{count} %{plural_model}"
+      selection_toggle_explanation: "(Toggle Избор)"
+      link: "Създаване на една"
+      action_label: "%{title} Избрани"
+      labels:
+        destroy: "Изтриване"
+    comments:
+      body: "тяло"
+      author: "автор"
+      title: "коментар"
+      add: "Добавяне на коментар"
+      resource: "Resource"
+      no_comments_yet: "Все още няма коментари."
+      title_content: "Коментари (%{count})"
+      errors:
+        empty_text: "Коментар не е спасен, текст е празна."
+    devise:
+      login:
+        title: "Влез"
+        remember_me: "Запомни ме"
+        submit: "Влез"
+      reset_password:
+        title: "Забравена парола?"
+        submit: "Възстановите паролата си"
+      change_password:
+        title: "Промяна на паролата"
+        submit: "Промяна на паролата си"
+      links:
+        sign_in: "Влезте в профила си"
+        forgot_your_password: "Забравена парола?"
+

data/lib/active_admin/locales/ca.yml

@@ -42,3 +42,39 @@ ca:
     blank_slate:
       content: "Encara no hi ha cap %{resource_name}."
       link: "Crea'n un/a"
+    batch_actions:
+      button_label: "les accions per lots"
+      delete_confirmation: "¿Està segur que desitja eliminar aquests %{plural_model}? Vostè no serà capaç de desfer això."
+      succesfully_destroyed:
+        one: "Va destruir amb èxit 1 %{model}"
+        other: "Va destruir amb èxit %{count} %{plural_model}"
+      selection_toggle_explanation: "(Selecció de Canviar)"
+      link: "crear una"
+      action_label: "%{title} seleccionat"
+      labels:
+        destroy: "esborrar"
+    comments:
+      body: "Cos"
+      author: "autor"
+      title: "comentari"
+      add: "Afegeix comentari"
+      resource: "Recurs"
+      no_comments_yet: "No hi ha comentaris"
+      title_content: "comentaris (%{count})"
+      errors:
+        empty_text: "El comentari no es va salvar, el text estava buida."
+    devise:
+      login:
+        title: "iniciar sessió"
+        remember_me: "Recordar"
+        submit: "iniciar sessió"
+      reset_password:
+        title: "Heu perdut la contrasenya?"
+        submit: "Restablir la contrasenya"
+      change_password:
+        title: "Canvieu la contrasenya"
+        submit: "Canviar la contrasenya"
+      links:
+        sign_in: "Registrar"
+        forgot_your_password: "Heu perdut la contrasenya?"
+

data/lib/active_admin/locales/cs.yml

@@ -36,3 +36,39 @@ cs:
     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."
+      succesfully_destroyed:
+        one: "úspěšně zničil 1 %{model}"
+        other: "úspěšně zničil %{count} %{plural_model}"
+      selection_toggle_explanation: "(Změnit výběr)"
+      link: "vytvořit jeden"
+      action_label: "%{title} vybraný"
+      labels:
+        destroy: "vymazat"
+    comments:
+      body: "tělo"
+      author: "autor"
+      title: "komentář"
+      add: "Přidat komentář"
+      resource: "zdroj"
+      no_comments_yet: "Žádný nový komentář"
+      title_content: "Komentáře (%{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í"
+      reset_password:
+        title: "Zapomněli jste heslo?"
+        submit: "Obnovit heslo"
+      change_password:
+        title: "Změnit heslo"
+        submit: "Změnit své heslo"
+      links:
+        sign_in: "Přihlásit se"
+        forgot_your_password: "Zapomněli jste heslo?"
+

data/lib/active_admin/locales/da.yml

@@ -41,3 +41,39 @@ da:
     blank_slate:
       content: "Der er ingen %{resource_name} endnu."
       link: "Opret"
+    batch_actions:
+      button_label: "Batch Handlinger"
+      delete_confirmation: "Er du sikker på du vil slette disse %{plural_model}? Du vil ikke være i stand til at fortryde dette."
+      succesfully_destroyed:
+        one: "Vellykket ødelagt 1 %{model}"
+        other: "Vellykket ødelagt %{count} %{plural_model}"
+      selection_toggle_explanation: "(Skift Selection)"
+      link: "Opret en"
+      action_label: "%{title} Valgte"
+      labels:
+        destroy: "Slet"
+    comments:
+      body: "krop"
+      author: "forfatter"
+      title: "Kommentar"
+      add: "Tilføj Kommentar"
+      resource: "Resource"
+      no_comments_yet: "Ingen kommentarer endnu."
+      title_content: "Kommentarer (%{count})"
+      errors:
+        empty_text: "Kommentar blev ikke gemt, tekst var tom."
+    devise:
+      login:
+        title: "Login"
+        remember_me: "Husk mig"
+        submit: "Login"
+      reset_password:
+        title: "Glemt din adgangskode?"
+        submit: "Nulstille min adgangskode"
+      change_password:
+        title: "Skift din adgangskode"
+        submit: "Skift min adgangskode"
+      links:
+        sign_in: "Log ind"
+        forgot_your_password: "Glemt din adgangskode?"
+

data/lib/active_admin/locales/de.yml

@@ -52,3 +52,45 @@ de:
       title_content: "Kommentare (%{count})"
       errors:
         empty_text: "Der Kommentar wurde nicht gespeichert, da der Text fehlt."
+    devise:
+      login:
+        title: "Login"
+        remember_me: "erinnere dich an mich"
+        submit: "Login"
+      reset_password:
+        title: "Passwort vergessen?"
+        submit: "Mein Passwort zurücksetzen"
+      change_password:
+        title: "Ändern Sie Ihr Passwort"
+        submit: "Mein Passwort ändern"
+      links:
+        sign_in: "Anmeldung"
+        forgot_your_password: "Passwort vergessen?"
+  activerecord:
+    attributes:
+      admin_user: 
+        id: ID
+        email: E-Mail
+        encrypted_Password: Verschlüsseltes Passwort
+        reset_password_token: Passwort Reset Token
+        reset_password_sent_at: Passwort Reset Anweisungen gesendet am
+        remember_created_at: Passwort merken seit
+        sign_in_count: Anzahl Logins
+        current_sign_in_at: Aktuell angemeldet seit
+        last_sign_in_at: Letzter Login am
+        current_sign_in_ip: Aktuelle IP-Adresse
+        last_sign_in_ip: Letzte IP-Adresse
+        created_at: Erstellt am
+        updated_at: Aktualisiert am
+    models:
+      admin_user:
+        one: Administrator
+        other: Administratoren  
+  devise:      
+    failure:
+      admin_user:
+        invalid: Benutzername oder Kennwort nicht korrekt.
+        unauthenticated: Bitte melden Sie sich als Administrator an.
+    sessions:
+      admin_user:
+        signed_in: Erfolgreich als Administrator angemeldet.

data/lib/active_admin/locales/en.yml

@@ -43,7 +43,18 @@ en:
     blank_slate:
       content: "There are no %{resource_name} yet."
       link: "Create one"
-    comments:    
+    batch_actions:
+      button_label: "Batch Actions"
+      delete_confirmation: "Are you sure you want to delete these %{plural_model}? You won't be able to undo this."
+      succesfully_destroyed:
+        one: "Successfully destroyed 1 %{model}"
+        other: "Successfully destroyed %{count} %{plural_model}"
+      selection_toggle_explanation: "(Toggle Selection)"
+      link: "Create one"
+      action_label: "%{title} Selected"
+      labels:
+        destroy: "Delete"
+    comments:
       body: "Body"
       author: "Author"
       title: "Comment"
@@ -52,4 +63,18 @@ en:
       no_comments_yet: "No comments yet."
       title_content: "Comments (%{count})"
       errors:
-        empty_text: "Comment wasn't saved, text was empty."
+        empty_text: "Comment wasn't saved, text was empty."
+    devise:
+      login:
+        title: "Login"
+        remember_me: "Remember me"
+        submit: "Login"
+      reset_password:
+        title: "Forgot your password?"
+        submit: "Reset My Password"
+      change_password:
+        title: "Change your password"
+        submit: "Change my password"
+      links:
+        sign_in: "Sign in"
+        forgot_your_password: "Forgot your password?"