activeadmin 2.6.1 → 2.12.0

data/app/javascript/active_admin/lib/table-checkbox-toggler.js

@@ -33,6 +33,6 @@ class TableCheckboxToggler extends CheckboxToggler {
       .find(':checkbox')
       .click();
   }
-};
+}
 
 export default TableCheckboxToggler;

data/app/views/active_admin/devise/mailer/reset_password_instructions.html.erb

@@ -2,7 +2,7 @@
 
 <p>Someone has requested a link to change your password, and you can do this through the link below.</p>
 
-<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @resource.reset_password_token) %></p>
+<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
 
 <p>If you didn't request this, please ignore this email.</p>
 <p>Your password won't change until you access the link above and create a new one.</p>

data/app/views/active_admin/devise/mailer/unlock_instructions.html.erb

@@ -1,7 +1,7 @@
 <p>Hello <%= @resource.email %>!</p>
 
-<p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p>
+<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
 
 <p>Click the link below to unlock your account:</p>
 
-<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @resource.unlock_token) %></p>
+<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>

data/app/views/active_admin/devise/shared/_links.erb

@@ -27,7 +27,7 @@
 <%- if devise_mapping.omniauthable? %>
   <%- resource_class.omniauth_providers.each do |provider| %>
     <%= link_to t('active_admin.devise.links.sign_in_with_omniauth_provider', provider: provider.to_s.titleize),
-          omniauth_authorize_path(resource_name, provider) %>
+          omniauth_authorize_path(resource_name, provider), method: :post %>
     <br>
   <% end -%>
 <% end -%>

data/app/views/active_admin/page/index.html.arb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 insert_tag active_admin_application.view_factory["page"]

data/app/views/active_admin/resource/edit.html.arb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 insert_tag renderer_for(:edit)

data/app/views/active_admin/resource/index.html.arb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 insert_tag renderer_for(:index)

data/app/views/active_admin/resource/new.html.arb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 insert_tag renderer_for(:new)

data/app/views/active_admin/resource/show.html.arb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 insert_tag renderer_for(:show)

data/app/views/layouts/active_admin.html.arb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 insert_tag view_factory.layout

data/app/views/layouts/active_admin_logged_out.html.erb

@@ -6,10 +6,18 @@
   <title><%= [@page_title, ActiveAdmin.application.site_title(self)].compact.join(" | ") %></title>
 
   <% ActiveAdmin.application.stylesheets.each do |style, options| %>
-    <%= stylesheet_link_tag style, options %>
+    <% if ActiveAdmin.application.use_webpacker %>
+      <%= stylesheet_pack_tag style, **options %>
+    <% else %>
+      <%= stylesheet_link_tag style, **options %>
+    <% end %>
   <% end %>
   <% ActiveAdmin.application.javascripts.each do |path| %>
-    <%= javascript_include_tag path %>
+    <% if ActiveAdmin.application.use_webpacker %>
+      <%= javascript_pack_tag path %>
+    <% else %>
+      <%= javascript_include_tag path %>
+    <% end %>
   <% end %>
 
   <%= favicon_link_tag ActiveAdmin.application.favicon if ActiveAdmin.application.favicon %>
@@ -24,9 +32,11 @@
 <div id="wrapper">
 
   <div id="content_wrapper">
-    <% flash_messages.each do |type, message| %>
-      <%= content_tag :div, message, class: "flash flash_#{type}" %>
-    <% end %>
+    <div class="flashes">
+      <% flash_messages.each do |type, message| %>
+        <%= content_tag :div, message, class: "flash flash_#{type}" %>
+      <% end %>
+    </div>
     <div id="active_admin_content">
       <%= yield %>
     </div>

data/config/locales/ar.yml

@@ -8,7 +8,7 @@ ar:
     edit: "تعديل"
     delete: "حذف"
     delete_confirmation: "هل تريد تأكيد الحذف؟"
-    new_model: "جديد %{model}"
+    new_model: "%{model} جديد"
     edit_model: "تعديل %{model}"
     delete_model: "حذف %{model}"
     details: "تفاصيل %{model}"
@@ -97,12 +97,12 @@ ar:
       password:
         title: "كلمة المرور"
       sign_up:
-        title: "تسجيل الدخول"
-        submit: "تسجيل الدخول"
+        title: "تسجيل"
+        submit: "تسجيل"
       login:
-        title: "دخول"
+        title: "تسجيل الدخول"
         remember_me: "تذكرني"
-        submit: "تسحيل"
+        submit: "تسجيل الدخول"
       reset_password:
         title: "هل نسيت كلمة المرور؟"
         submit: "استرجاع كلمة المرور"
@@ -117,7 +117,7 @@ ar:
         submit: "إعادة ارسال تعليمات التأكيد"
       links:
         sign_up: "التسجيل"
-        sign_in: "دخول"
+        sign_in: "تسجيل الدخول"
         forgot_your_password: "هل نسيت كلمة المرور؟"
         sign_in_with_omniauth_provider: "تسجيل الدخول بـ %{provider}"
         resend_unlock_instructions: "إعادة إرسال تعليمات تنشيط الحساب"

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

@@ -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/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/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/vi.yml

@@ -3,11 +3,11 @@ 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}"
@@ -16,8 +16,8 @@ vi:
     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ỏ"
@@ -29,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/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

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/Gemfile

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