activeadmin 2.2.0 → 2.12.0

data/config/locales/en.yml

@@ -91,8 +91,8 @@ en:
       default_confirmation: "Are you sure you want to do this?"
       delete_confirmation: "Are you sure you want to delete these %{plural_model}?"
       succesfully_destroyed:
-        one: "Successfully destroyed 1 %{model}"
-        other: "Successfully destroyed %{count} %{plural_model}"
+        one: "Successfully deleted 1 %{model}"
+        other: "Successfully deleted %{count} %{plural_model}"
       selection_toggle_explanation: "(Toggle Selection)"
       action_label: "%{title} Selected"
       labels:
@@ -105,7 +105,7 @@ en:
       author: "Author"
       add: "Add Comment"
       delete: "Delete Comment"
-      delete_confirmation: "Are you sure you want to delete these comment?"
+      delete_confirmation: "Are you sure you want to delete these comments?"
       resource: "Resource"
       no_comments_yet: "No comments yet."
       author_missing: "Anonymous"

data/config/locales/es-MX.yml

@@ -86,7 +86,8 @@ es-MX:
         title: "Cambie su contraseña"
         submit: "Cambiar mi contraseña"
       links:
-        sign_in: "Registrarse"
+        sign_in: "Iniciar Sesión"
+        sign_up: "Registrarse"
         forgot_your_password: "¿Olvidó su contraseña?"
         sign_in_with_omniauth_provider: "Conéctate con %{provider}"
     index_list:

data/config/locales/es.yml

@@ -23,7 +23,7 @@ es:
     view: "Ver"
     edit: "Editar"
     delete: "Eliminar"
-    delete_confirmation: "¿Está seguro de que quiere eliminar esto?"
+    delete_confirmation: "¿Confirma que desea borrar este elemento?"
     create_another: "Crear otro %{model}"
     new_model: "Añadir %{model}"
     edit_model: "Editar %{model}"
@@ -89,7 +89,7 @@ es:
     batch_actions:
       button_label: "Acciones en masa"
       default_confirmation: "¿Seguro que quieres hacer esto?"
-      delete_confirmation: "Eliminar %{plural_model}: ¿Está seguro?"
+      delete_confirmation: "Se eliminarán %{plural_model}. ¿Desea continuar?"
       succesfully_destroyed:
         one: "Se ha destruido 1 %{model} con éxito"
         other: "Se han destruido %{count} %{plural_model} con éxito"
@@ -105,7 +105,7 @@ es:
       author: "Autor"
       add: "Comentar"
       delete: "Borrar Comentario"
-      delete_confirmation: "¿Está seguro que desea borrar este comentario?"
+      delete_confirmation: "¿Confirma que desea borrar este comentario?"
       resource: "Recurso"
       no_comments_yet: "No hay comentarios aún."
       author_missing: "Anónimo"
@@ -143,8 +143,8 @@ es:
         title: "Reenviar instrucciones de confirmación"
         submit: "Reenviar instrucciones de confirmación"
       links:
-        sign_up: "Ingresar"
-        sign_in: "Registrarse"
+        sign_up: "Registrarse"
+        sign_in: "Iniciar Sesión"
         forgot_your_password: "¿Olvidó su contraseña?"
         sign_in_with_omniauth_provider: "Conéctate con %{provider}"
         resend_unlock_instructions: "Reenviar instrucciones de desbloqueo"

data/config/locales/fr.yml

@@ -7,7 +7,7 @@ fr:
     view: "Voir"
     edit: "Modifier"
     delete: "Supprimer"
-    delete_confirmation: "Êtes-vous certain de vouloir supprimer ceci ?"
+    delete_confirmation: "Voulez-vous vraiment supprimer ceci ?"
     create_another: "Créer autre %{model}"
     new_model: "Créer %{model}"
     edit_model: "Modifier %{model}"
@@ -69,8 +69,8 @@ fr:
       button_label: "Actions"
     batch_actions:
       button_label: "Actions groupées"
-      default_confirmation: "Êtes-vous sûr de vouloir faire cela ?"
-      delete_confirmation: "Êtes-vous sûr de vouloir supprimer ces %{plural_model} ?"
+      default_confirmation: "Voulez-vous vraiment faire cela ?"
+      delete_confirmation: "Voulez-vous vraiment supprimer ces %{plural_model} ?"
       succesfully_destroyed:
         one: "1 %{model} supprimé"
         other: "%{count} %{plural_model} supprimés"
@@ -86,7 +86,7 @@ fr:
       author: "Auteur"
       add: "Ajouter un commentaire"
       delete: "Supprimer ce commentaire"
-      delete_confirmation: "Êtes-vous sûr de vouloir supprimer ce commentaire ?"
+      delete_confirmation: "Voulez-vous vraiment supprimer ce commentaire ?"
       resource: "Ressource"
       no_comments_yet: "Aucun commentaire actuellement"
       author_missing: "Anonyme"

data/config/locales/it.yml

@@ -1,4 +1,20 @@
 it:
+  activerecord:
+    models:
+      comment:
+        one: "Commento"
+        other: "Commenti"
+      active_admin/comment:
+        one: "Commento"
+        other: "Commenti"
+    attributes:
+      active_admin/comment:
+        author_type: "Tipo di Autore"
+        body: "Corpo"
+        created_at: "Creato il"
+        namespace: "Namespace"
+        resource_type: "Tipo di risorsa"
+        updated_at: "Aggiornato il"
   active_admin:
     dashboard: Dashboard
     dashboard_welcome:
@@ -37,6 +53,8 @@ it:
         lteq_datetime: "Minore o uguale a"
         from: "Da"
         to: "A"
+    scopes:
+      all: "Tutti"
     search_status:
       headline: "Situazione filtri:"
       current_scope: "Contesto selezionato:"

data/config/locales/ja.yml

@@ -8,7 +8,7 @@ ja:
     edit: "編集"
     delete: "削除"
     delete_confirmation: "本当に削除しますか？"
-    create_another: "%{model} を追加する"
+    create_another: "%{model} を続けて作成する"
     new_model: "%{model} を作成する"
     edit_model: "%{model} を編集する"
     delete_model: "%{model} を削除する"
@@ -18,7 +18,7 @@ ja:
     previous: "前"
     next: "次"
     download: "ダウンロード:"
-    has_many_new: "新規に %{model} を追加する"
+    has_many_new: "%{model} を追加する"
     has_many_delete: "削除する"
     has_many_remove: "削除する"
     filters:
@@ -26,7 +26,7 @@ ja:
         filter: "絞り込む"
         clear: "条件を削除する"
       predicates:
-        contains: "含まれています"
+        contains: "を含む"
         equals: "等しい"
         starts_with: "で始まる"
         ends_with: "で終わる"

data/config/locales/ko.yml

@@ -69,7 +69,7 @@ ko:
         one: "성공적으로 1개 %{model}을/를 삭제하였습니다"
         other: "성공적으로 %{count}개의 %{plural_model}을/를 삭제하였습니다"
       selection_toggle_explanation: "(선택 항목 바꾸기)"
-      action_label: "%{title} 선택됨"
+      action_label: "선택한 항목 %{title}"
       labels:
         destroy: "삭제"
     comments:

data/config/locales/lv.yml

@@ -60,8 +60,8 @@ lv:
       default_confirmation: "Vai tiešām vēlaties to darīt?"
       delete_confirmation: "Vai tiešām vēlaties dzēst šos %{plural_model}?"
       succesfully_destroyed:
-        one: "Successfully destroyed 1 %{model}"
-        other: "Successfully destroyed %{count} %{plural_model}"
+        one: "Successfully deleted 1 %{model}"
+        other: "Successfully deleted %{count} %{plural_model}"
       selection_toggle_explanation: "(Toggle Selection)"
       action_label: "%{title} Selected"
       labels:

data/config/locales/nl.yml

@@ -114,7 +114,7 @@ nl:
         submit: "inloggen"
       reset_password:
         title: "Wachtwoord vergeten?"
-        submit: "Reset mijn wachtwoord vergeten"
+        submit: "Reset mijn wachtwoord"
       change_password:
         title: "Wijzig uw wachtwoord"
         submit: "Mijn wachtwoord wijzigen"

data/config/locales/ro.yml

@@ -47,8 +47,9 @@ ro:
       multiple: "Sunt afisate <b>%{from}&nbsp;-&nbsp;%{to}</b> din <b>%{total}</b> inregistrari"
       multiple_without_total: "Sunt afisate <b>%{from}&nbsp;-&nbsp;%{to}</b>"
       entry:
-        one: "inregistrare"
-        other: "inregistrari"
+        one: "înregistrăre"
+        few: "înregistrări"
+        other: "înregistrări"
     any: "Oricare"
     blank_slate:
       content: "Momentan nu exista %{resource_name}."

data/config/locales/sk.yml

@@ -1,4 +1,24 @@
 sk:
+  activerecord:
+    models:
+      comment:
+        one: "Komentár"
+        few: "Komentáre"
+        many: "Komentárov"
+        other: "Komentáre"
+      active_admin/comment:
+        one: "Komentár"
+        few: "Komentáre"
+        many: "Komentárov"
+        other: "Komentáre"
+    attributes:
+      active_admin/comment:
+        author_type: "Typ autora"
+        body: "Telo"
+        created_at: "Vytvorený"
+        namespace: "Namespace"
+        resource_type: "Typ komentovanej položky"
+        updated_at: "Upravený"
   active_admin:
     dashboard: Úvod
     dashboard_welcome:
@@ -8,6 +28,7 @@ sk:
     edit: "Upraviť"
     delete: "Zmazať"
     delete_confirmation: "Ste si istí, že chcete túto položku zmazať?"
+    create_another: "Vytvoriť ďalší %{model}"
     new_model: "Vytvoriť"
     edit_model: "Upraviť"
     delete_model: "Zmazať"
@@ -20,6 +41,7 @@ sk:
     has_many_new: "Pridať nový"
     has_many_delete: "Zmazať"
     has_many_remove: "Odstrániť"
+    move: "Presunúť"
     filters:
       buttons:
         filter: "Filtrovať"
@@ -31,6 +53,17 @@ sk:
         ends_with: "Končí na"
         greater_than: "Väčší ako"
         less_than: "Menší ako"
+        gteq_datetime: "Od"
+        lteq_datetime: "Do"
+        from: "Od"
+        to: "Do"
+    scopes:
+      all: "Všetko"
+    search_status:
+      headline: "Stav vyhľadávania:"
+      current_scope: "Scope:"
+      current_filters: "Filtre:"
+      no_current_filters: "Žiadne"
     status_tag:
       "yes": "Áno"
       "no": "Nie"
@@ -40,6 +73,7 @@ sk:
     powered_by: "%{active_admin} %{version}"
     sidebars:
       filters: "Filtre"
+      search_status: "Stav vyhľadávania"
     pagination:
       empty: "Nenájdený."
       one: "Zobrazená  <b>1</b> položka"
@@ -70,11 +104,14 @@ sk:
       labels:
         destroy: "Vymazať"
     comments:
+      created_at: "Vytvorený"
       resource_type: "Typ zdroja"
       author_type: "Typ autora"
       body: "Telo"
       author: "Autor"
       add: "Pridať komentár"
+      delete: "Zmazať komentár"
+      delete_confirmation: "Naozaj chcete zmazať tento komentár?"
       resource: "Zdroj"
       no_comments_yet: "Žiadny komentár"
       author_missing: "Anonymný"
@@ -82,6 +119,19 @@ sk:
       errors:
         empty_text: "Komentár nebol uložený, je prázdny."
     devise:
+      username:
+        title: "Užívateľské meno"
+      email:
+        title: "Email"
+      subdomain:
+        title: "Subdoména"
+      password:
+        title: "Heslo"
+      password_confirmation:
+        title: "Potvrdenie hesla"
+      sign_up:
+        title: "Registrácia"
+        submit: "Registrovať"
       login:
         title: "Prihlásenie"
         remember_me: "Zapamätať si ma"
@@ -95,11 +145,20 @@ sk:
       unlock:
         title: "Zaslanie inštrukcií k odomknutiu účtu"
         submit: "Zaslať inštrukcií k odomknutiu účtu"
+      resend_confirmation_instructions:
+        title: "Preposlanie potvrdzovacie inštrukcie"
+        submit: "Preposlať potvrdzovacie inštrukcie"
       links:
         sign_in: "Prihlásiť sa"
         sign_up: "Registrovať sa"
         forgot_your_password: "Zabudli ste heslo?"
         sign_in_with_omniauth_provider: "Prihlásiť sa cez %{provider}"
+        resend_unlock_instructions: "Poslať znovu inštrukcie na odomknutie účtu"
+        resend_confirmation_instructions: "Preposlať potvrdzovacie inštrukcie"
+    unsupported_browser:
+      headline: "ActiveAdmin nepodporuje Internet Explorer vo verzii <= 8."
+      recommendation: "Odporúčame <a href=\"http://browsehappy.com/\">aktualizovať Váš prehliadač</a>."
+      turn_off_compatibility_view: "Ak používate Internet Explorer vo verzii >= 9, uistite sa, že <a href=\"https://support.microsoft.com/en-us/help/17471\">\"režim kompatibility\" je vypnutý</a>"
     access_denied:
       message: "Nemáte oprávnenie k vykonaniu tejto akcie."
     index_list:

data/config/locales/vi.yml

@@ -3,20 +3,21 @@ vi:
     dashboard: Bảng điều khiển
     dashboard_welcome:
       welcome: "Chào mừng bạn đến với Active Admin. Đây là trang điều khiển mặc định."
-      call_to_action: "Để thêm phần phần cho trang điều khiển hãy chỉnh sửa 'app/admin/dashboard.rb'"
+      call_to_action: "Để thêm thành phần cho trang điều khiển hãy chỉnh sửa 'app/admin/dashboard.rb'"
     view: "Xem"
     edit: "Chỉnh sửa"
     delete: "Xóa"
-    delete_confirmation: "Bạn có chắc chắn rằng mình muốn xóa cái này?"
+    delete_confirmation: "Bạn có chắc chắn rằng mình muốn xóa không?"
     new_model: "Tạo mới %{model}"
     edit_model: "Chỉnh sửa %{model}"
     delete_model: "Xóa %{model}"
+    create_another: "Tạo thêm %{model}"
     details: "%{model} Chi tiết"
     cancel: "Hủy"
     empty: "Trống"
     previous: "Trước"
-    next: "Tiếp"
-    download: "Download:"
+    next: "Sau"
+    download: "Tải về:"
     has_many_new: "Thêm mới %{model}"
     has_many_delete: "Xóa"
     has_many_remove: "Hủy bỏ"
@@ -28,7 +29,7 @@ vi:
         contains: "Có chứa"
         equals: "Bằng"
         starts_with: "Bắt đầu với"
-        ends_with: "Kết thúc với việc"
+        ends_with: "Kết thúc bởi"
         greater_than: "Lớn hơn"
         less_than: "Nhỏ hơn"
         gteq_datetime: "Lớn hơn hoặc bằng"

data/docs/0-installation.md

@@ -29,7 +29,7 @@ After installing the gem, you need to run the generator. Here are your options:
   rails g active_admin:install --skip-users
   ```
 
-* If you want to use an existing user class, provide it as an argument:
+* If you want to customize the name of the generated user class, or if you want to use an existing user class, provide the class name as an argument:
 
   ```sh
   rails g active_admin:install User
@@ -51,8 +51,8 @@ The generator adds these core files, among others:
 Now, migrate and seed your database before starting the server:
 
 ```sh
-rake db:migrate
-rake db:seed
+rails db:migrate
+rails db:seed
 rails server
 ```
 
@@ -112,6 +112,30 @@ Draper::CollectionDecorator.send :delegate, :per_page_kaminari
 
 If you're getting the error `wrong number of arguments (6 for 4..5)`, [read #2703].
 
+## webpacker
+
+You can **opt-in to using Webpacker for ActiveAdmin assets** as well by updating your configuration to turn on the `use_webpacker` option, either at installation time or manually.
+
+* at active_admin installation:
+
+  ```sh
+  rails g active_admin:install --use_webpacker
+  ```
+
+* manually:
+
+  ```ruby
+  ActiveAdmin.setup do |config|
+    config.use_webpacker = true
+  end
+  ```
+
+  And run the generator to get default Active Admin assets:
+
+  ```sh
+  rails g active_admin:webpacker
+  ```
+
 [CHANGELOG]: https://github.com/activeadmin/activeadmin/blob/master/CHANGELOG.md
 [dashboard.rb]: https://github.com/activeadmin/activeadmin/blob/master/lib/generators/active_admin/install/templates/dashboard.rb
 [active_admin.rb]: https://github.com/activeadmin/activeadmin/blob/master/lib/generators/active_admin/install/templates/active_admin.rb.erb

data/docs/1-general-configuration.md

@@ -106,6 +106,26 @@ ActiveAdmin.setup do |config|
 end
 ```
 
+If you are creating a multi-tenant application you may want to have multiple namespaces mounted to the same path. We can do this using the `route_options` settings on the namespace
+
+```ruby
+config.namespace :site_1 do |admin|
+  admin.route_options = { path: :admin, constraints: ->(request){ request.domain == "site1.com" } }
+end
+
+config.namespace :site_2 do |admin|
+  admin.route_options = { path: :admin, constraints: ->(request){ request.domain == "site2.com" } }
+end
+```
+
+If you would like to mount the namespace to a subdomain instead of path we can use the `route_options` for this as well
+
+```ruby
+config.namespace :admin do |admin|
+  admin.route_options = { path: '', subdomain: 'admin' }
+end
+```
+
 Each setting available in the Active Admin setup block is configurable on a per
 namespace basis.
 

data/docs/11-decorators.md

@@ -8,11 +8,6 @@ Active Admin allows you to use the decorator pattern to provide view-specific
 versions of a resource. [Draper](https://github.com/drapergem/draper) is
 recommended but not required.
 
-To use decorator support without Draper, your decorator must support a variety
-of collection methods to support pagination, filtering, etc. See
-[this github issue discussion](https://github.com/activeadmin/activeadmin/issues/3600)
-and [this gem](https://github.com/kiote/activeadmin-poro-decorator) for more details.
-
 ## Example usage
 
 ```ruby
@@ -42,6 +37,22 @@ ActiveAdmin.register Post do
 end
 ```
 
+You can pass any decorator class as an argument to `decorate_with`
+as long as it accepts the record to be decorated as a parameter in
+the initializer, and responds to all the necessary methods.
+
+```ruby
+# app/decorators/post_decorator.rb
+class PostDecorator
+  attr_reader :post
+  delegate_missing_to :post
+
+  def initialize(post)
+    @post = post
+  end
+end
+```
+
 ## Forms
 
 By default, ActiveAdmin does *not* decorate the resource used to render forms.

data/docs/2-resource-customization.md

@@ -164,7 +164,8 @@ The menu method accepts a hash with the following options:
 
 * `:label` - The string or proc label to display in the menu. If it's a proc, it
   will be called each time the menu is rendered.
-* `:parent` - The string id (or label) of the parent used for this menu
+* `:parent` - The string id (or label) of the parent used for this menu, or an array
+  of string ids (or labels) for a nested menu
 * `:if` - A block or a symbol of a method to call to decide if the menu item
   should be displayed
 * `:priority` - The integer value of the priority, which defaults to `10`
@@ -227,6 +228,14 @@ end
 Note that the "Blog" parent menu item doesn't even have to exist yet; it can be
 dynamically generated for you.
 
+To further nest an item under a submenu, provide an array of parents.
+
+```ruby
+ActiveAdmin.register Post do
+  menu parent: ["Admin", "Blog"]
+end
+```
+
 ### Customizing Parent Menu Items
 
 All of the options given to a standard menu item are also available to
@@ -355,7 +364,7 @@ end
 ```
 
 If you need to completely replace the record retrieving code (e.g., you have a
-custom `to_param` implementation in your models), override the `resource` method
+custom `to_param` implementation in your models), override the `find_resource` method
 on the controller:
 
 ```ruby

data/docs/3-index-pages/index-as-table.md

@@ -193,6 +193,13 @@ controller do
 end
 ```
 
+You can also define associated objects to include outside of the
+`scoped_collection` method:
+
+```ruby
+includes :publisher
+```
+
 Then it's simple to sort by any Publisher attribute from within the index table:
 
 ```ruby

data/docs/3-index-pages.md

@@ -212,7 +212,7 @@ end
 ```
 
 Scopes can be labelled with a translation, e.g.
-`activerecord.scopes.invoice.expired`.
+`active_admin.scopes.scope_method`.
 
 ### Scopes groups
 

data/docs/5-forms.md

@@ -56,7 +56,7 @@ Which looks for something like this:
 
 ```ruby
 # app/views/admin/posts/_form.html.arb
-insert_tag active_admin_form_for resource do |f|
+active_admin_form_for [:admin, resource] do |f|
   inputs :title, :body
   actions
 end
@@ -110,8 +110,9 @@ ActiveAdmin.register Post do
       end
     end
     f.inputs do
-      f.has_many :comment,
+      f.has_many :comments,
                  new_record: 'Leave Comment',
+                 remove_record: 'Remove Comment',
                  allow_destroy: -> (c) { c.author?(current_admin_user) } do |b|
         b.input :body
       end
@@ -139,6 +140,10 @@ The `:new_record` option controls the visibility of the new record button (shown
 by default).  If you pass a string, it will be used as the text for the new
 record button.
 
+The `:remove_record` option controls the text of the remove button (shown after
+the new record button is pressed). If you pass a string, it will be used as the
+text for the remove button.
+
 The `:sortable` option adds a hidden field and will enable drag & drop sorting
 of the children. It expects the name of the column that will store the index of
 each child.

data/docs/6-show-pages.md

@@ -79,3 +79,15 @@ ActiveAdmin.register Book do
   end
 end
 ```
+
+If you want to keep the default show data, but add something extra to it:
+
+```ruby
+show do
+  div do
+    h3 'Some custom charts about this object'
+    render partial: 'charts'
+  end
+  default_main_content
+end
+```

data/docs/8-custom-actions.md

@@ -62,7 +62,7 @@ HTTP verbs. In that case, this is the suggested approach:
 ```ruby
 member_action :foo, method: [:get, :post] do
   if request.post?
-    resource.update_attributes! foo: params[:foo] || {}
+    resource.update! foo: params[:foo] || {}
     head :ok
   else
     render :foo

data/docs/9-batch-actions.md

@@ -154,13 +154,13 @@ batch_action :doit, form: -> { {user: User.pluck(:name, :id)} } do |ids, inputs|
 end
 ```
 
-Under the covers this is powered by the JS `ActiveAdmin.modal_dialog` which you
+Under the covers this is powered by the JS `ActiveAdmin.ModalDialog` which you
 can use yourself:
 
 ```coffee
 if $('body.admin_users').length
   $('a[data-prompt]').click ->
-    ActiveAdmin.modal_dialog $(@).data('prompt'), comment: 'textarea',
+    ActiveAdmin.ModalDialog $(@).data('prompt'), comment: 'textarea',
       (inputs)=>
         $.post "/admin/users/#{$(@).data 'id'}/change_state",
           comment: inputs.comment, state: $(@).data('state'),

data/docs/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
+source "https://rubygems.org"
 
-gem 'github-pages'
-gem 'jekyll-redirect-from'
+gem "github-pages"