activeadmin 1.1.0 → 2.4.0

data/config/locales/uk.yml

@@ -31,6 +31,8 @@ uk:
         ends_with: "Закінчується"
         greater_than: "більше"
         less_than: "менше"
+        from: "від"
+        to: "до"
     search_status:
       headline: "Статус пошуку:"
       current_scope: "Область:"
@@ -39,6 +41,7 @@ uk:
     status_tag:
       "yes": "Так"
       "no": "Ні"
+      "unset": "Ні"
     main_content: "Створіть %{model}#main_content для відображення вмісту."
     logout: "Вийти"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/vi.yml

@@ -1,9 +1,9 @@
 vi:
   active_admin:
-    dashboard: Dashboard
+    dashboard: Bảng điều khiển
     dashboard_welcome:
-      welcome: "Chào mừng bạn đến với Active Admin. Đây là trang Dashboard mặc định."
-      call_to_action: "Để thêm phần phần cho trang Dashboar hãy chỉnh sửa 'app/admin/dashboard.rb'"
+      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'"
     view: "Xem"
     edit: "Chỉnh sửa"
     delete: "Xóa"
@@ -25,26 +25,38 @@ vi:
         filter: "Lọc"
         clear: "Xóa dữ liệu lọc"
       predicates:
-        contains: "Thông tin"
+        contains: "Có chứa"
         equals: "Bằng"
         starts_with: "Bắt đầu với"
         ends_with: "Kết thúc với việc"
         greater_than: "Lớn hơn"
         less_than: "Nhỏ hơn"
+        gteq_datetime: "Lớn hơn hoặc bằng"
+        lteq_datetime: "Nhỏ hơn hoặc bằng"
+        from: "Từ"
+        to: "Đến"
+    search_status:
+      headline: "Danh sách tìm kiếm:"
+      current_scope: "Phạm vi:"
+      current_filters: "Bộ lộc hiện tại:"
+      no_current_filters: "Không có"
     status_tag:
       "yes": "Có"
       "no": "Không Có"
+      "unset": "Không Có"
     main_content: "Xin bổ sung %{model}#main_content để hiển thị nội dung."
     logout: "Đăng xuất"
     powered_by: "Powered by %{active_admin} %{version}"
     sidebars:
       filters: "Bộ Lọc"
+      search_status: "Trạng thái tìm kiếm"
     pagination:
       empty: "Không có %{model} nào được tìm thấy"
       one: "Đang hiển thị <b>1</b> %{model}"
       one_page: "Đang hiển thị <b>tất cả %{n}</b> %{model}"
       multiple: "Đang hiển thị %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> of <b>%{total}</b> trong tất cả."
       multiple_without_total: "Đang hiển thị %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>."
+      per_page: "Mỗi trang: "
       entry:
         one: "entry"
         other: "entries"
@@ -66,15 +78,33 @@ vi:
       labels:
         destroy: "Xóa"
     comments:
+      created_at: "Đã tạo"
+      resource_type: "Resource Type"
       body: "Nội dung"
       author: "Tác giả"
       add: "Thêm bình luận"
-      resource: "Tài nguyên"
+      delete: "Xoá bình luận"
+      delete_confirmation: "Bạn có chắc chắn muốn xóa những bình luận này?"
+      resource: "Resource"
       no_comments_yet: "Chưa có bình luận."
+      author_missing: "Vô danh"
       title_content: "Bình luận (%{count})"
       errors:
         empty_text: "Lời bình luận chưa được lưu, vì nội dung còn trống."
     devise:
+      username:
+        title: "Tên người dùng"
+      email:
+        title: "Email"
+      subdomain:
+        title: "Tên miền phụ"
+      password:
+        title: "Mật khẩu"
+      password_confirmation:
+        title: "Mật khẩu xác nhận"
+      sign_up:
+        title: "Đăng ký"
+        submit: "Đăng ký"
       login:
         title: "Đăng nhập"
         remember_me: "Ghi nhớ tôi"
@@ -85,8 +115,20 @@ vi:
       change_password:
         title: "Thay đổi mật khẩu của bạn"
         submit: "Thay đổi mật khẩu của tôi"
+      unlock:
+        title: "Gởi lại hướng dẫn mở khoá"
+        submit: "Gởi lại hướng dẫn mở khoá"
+      resend_confirmation_instructions:
+        title: "Gởi lại hướng dẫn xác nhận"
+        submit: "Gởi lại hướng dẫn xác nhận"
       links:
         sign_in: "Đăng nhập"
         forgot_your_password: "Quên mật khẩu của bạn?"
         sign_in_with_omniauth_provider: "Đăng nhập với %{provider}"
-
+    access_denied:
+      message: "Bạn không có quyền thực hiện tính năng này"
+    index_list:
+      table: "Bảng"
+      block: "Danh sách"
+      grid: "Lưới"
+      blog: "Blog"

data/config/locales/zh-CN.yml

@@ -8,12 +8,13 @@
     edit: "编辑"
     delete: "删除"
     delete_confirmation: "确定删除?"
+    create_another: "新建另一个%{model}"
     new_model: "新建%{model}"
     edit_model: "编辑%{model}"
     delete_model: "删除%{model}"
     details: "%{model}详情"
     cancel: "取消"
-    empty: "清空"
+    empty: "未定义"
     previous: "上一个"
     next: "下一个"
     download: "下载:"
@@ -31,14 +32,19 @@
         ends_with: "完与"
         greater_than: "大于"
         less_than: "小于"
+        gteq_datetime: "大于等于"
+        lteq_datetime: "小于等于"
+        from: "起"
+        to: "止"
     search_status:
       headline: "搜索条件："
       current_scope: "搜索范围："
       current_filters: "过滤条件："
       no_current_filters: "无"
     status_tag:
-      "yes": "是的"
-      "no": "无"
+      "yes": "是"
+      "no": "否"
+      "unset": "否"
     main_content: "请执行 %{model}#main_content 来显示内容."
     logout: "退出"
     powered_by: "Powered by %{active_admin} %{version}"
@@ -51,6 +57,7 @@
       one_page: "显示 <b>所有 %{n}</b> %{model}"
       multiple: "显示所有 <b>%{total}</b> %{model}中的<b>%{from}&nbsp;-&nbsp;%{to}</b> 条"
       multiple_without_total: "%{model}中的<b>%{from}&nbsp;-&nbsp;%{to}</b> 条"
+      per_page: "每页："
       entry:
         one: "条目"
         other: "条目"
@@ -63,7 +70,7 @@
     batch_actions:
       button_label: "批处理"
       default_confirmation: "你确定你要这样做？"
-      delete_confirmation: "你确定要删除所有%{plural_model}?"
+      delete_confirmation: "你确定要删除这些%{plural_model}?"
       succesfully_destroyed:
         one: "成功删除 1 %{model}"
         other: "成功删除 %{count} %{plural_model}"
@@ -72,11 +79,17 @@
       labels:
         destroy: "删除"
     comments:
+      created_at: "创建于"
+      resource_type: "资源类型"
+      author_type: "作者类型"
       body: "内容"
       author: "作者"
       add: "添加评论"
+      delete: "删除评论"
+      delete_confirmation: "你确定删除这些评论？"
       resource: "资源"
       no_comments_yet: "暂时没有评论"
+      author_missing: "匿名"
       title_content: "(%{count})条评论"
       errors:
         empty_text: "评论保存失败，内空不能为空."
@@ -89,6 +102,11 @@
         title: "子域"
       password:
         title: "密码"
+      password_confirmation:
+        title: "确认密码"
+      sign_up:
+        title: "注册"
+        submit: "注册"
       login:
         title: "登录"
         remember_me: "记住我"
@@ -96,6 +114,9 @@
       reset_password:
         title: "忘记了密码？"
         submit: "重置我的密码"
+      change_password:
+        title: "修改密码"
+        submit: "修改密码"
       unlock:
         title: "重新发送送解锁命令"
         submit: "重新发送送解锁命令"
@@ -103,12 +124,20 @@
         title: " 重新发送确认指示"
         submit: " 重新发送确认指示"
       links:
+        sign_up: "注册"
         sign_in: "登录"
         forgot_your_password: "忘记了密码？"
-        sign_in_with_omniauth_provider: "登入%{provider}"
+        sign_in_with_omniauth_provider: "通过%{provider}登录"
+        resend_unlock_instructions: "重发解锁邮件"
+        resend_confirmation_instructions: "重发确认邮件"
     unsupported_browser:
       headline: "很抱歉，ActiveAdmin 已不再支持 Internet Explorer 8 以下版本的浏览器。"
       recommendation: "建议您升级到最新版本的<a href=\"http://windows.microsoft.com/ie\">Internet Explorer</a>，<a href=\"https://chrome.google.com/\">Google Chrome</a>，或是 <a href=\"https://mozilla.org/firefox/\">Firefox</a>。"
       turn_off_compatibility_view: "如果您使用的是 IE 9 或更新的版本，请确认<a href=\"https://support.microsoft.com/zh-cn/help/17472/windows-internet-explorer-11-fix-site-display-problems-compatibility-view\">已关闭“兼容性视图”</a>。"
     access_denied:
       message: "您无权处理此操作"
+    index_list:
+      table: "表格"
+      block: "列表"
+      grid: "网格"
+      blog: "博客"

data/config/locales/zh-TW.yml

@@ -39,6 +39,7 @@
     status_tag:
       "yes": "是"
       "no": "否"
+      "unset": "否"
     main_content: "請實作 %{model}#main_content 以顯示內容。"
     logout: "登出"
     powered_by: "Powered by %{active_admin} %{version}"

data/docs/.gitignore

@@ -0,0 +1 @@
+_site/

data/docs/0-installation.md

@@ -11,7 +11,7 @@ gem 'activeadmin'
 
 # Plus integrations with:
 gem 'devise'
-gem 'cancan' # or cancancan
+gem 'cancancan'
 gem 'draper'
 gem 'pundit'
 ```
@@ -44,7 +44,7 @@ After installing the gem, you need to run the generator. Here are your options:
 The generator adds these core files, among others:
 
 * `app/admin/dashboard.rb`
-* `app/assets/javascripts/active_admin.js.coffee`
+* `app/assets/javascripts/active_admin.js`
 * `app/assets/stylesheets/active_admin.scss`
 * `config/initializers/active_admin.rb`
 

data/docs/1-general-configuration.md

@@ -46,13 +46,22 @@ config.site_title_image = ->(context) { context.current_user.company.logo_url }
 
 ## Internationalization (I18n)
 
+Active Admin comes with translations for a lot of
+[locales](https://github.com/activeadmin/activeadmin/blob/master/config/locales/).
+Active Admin does not provide the translations for the kaminari gem it uses for pagination,
+to get these you can use the
+[kaminari-i18n](https://github.com/tigrish/kaminari-i18n) gem.
+
 To translate Active Admin to a new language or customize an existing
 translation, you can copy
 [config/locales/en.yml](https://github.com/activeadmin/activeadmin/blob/master/config/locales/en.yml)
 to your application's `config/locales` folder and update it. We welcome
 new/updated translations, so feel free to
 [contribute](https://github.com/activeadmin/activeadmin/blob/master/CONTRIBUTING.md)!
-To translate third party gems like devise, use for example devise-i18n.
+
+When using [devise](https://github.com/plataformatec/devise) for authentication,
+you can use the [devise-i18n](https://github.com/tigrish/devise-i18n)
+gem to get the devise translations for other locales.
 
 ## Localize Format For Dates and Times
 
@@ -160,6 +169,12 @@ You can customize the comment menu:
 config.comments_menu = { parent: 'Admin', priority: 1 }
 ```
 
+Remember to indicate where to place the comments and form with:
+
+```ruby
+active_admin_comments
+```
+
 ## Utility Navigation
 
 The "utility navigation" shown at the top right normally shows the current user

data/docs/10-custom-pages.md

@@ -134,3 +134,17 @@ end
 ```
 
 See also the [Custom Actions](8-custom-actions.md#http-verbs) example.
+
+## Use custom column as id
+
+You can use custom parameter instead of id
+
+```ruby
+ActiveAdmin.register User do
+  controller do
+    defaults :finder => :find_by_name
+  end
+end
+```
+
+This defines the resource route as `/admin/users/john` if user name is john

data/docs/12-arbre-components.md

@@ -115,6 +115,21 @@ end
 In the above example, the first column will not grow larger than 200px and will
 not shrink less than 100px.
 
+### Custom Column Class
+
+Pass the `:class` option to the column method to set a custom class.
+
+```ruby
+columns do
+  column class: "important" do
+    span "Column # 1"
+  end
+  column do
+    span "Column # 2"
+  end
+end
+```
+
 ## Table For
 
 Table For provides the ability to create tables like those present
@@ -130,10 +145,22 @@ table_for order.payments do
 end
 ```
 
-the `column` method can take a title as its first argument and data
+The `column` method can take a title as its first argument and data
 (`:your_method`) as its second (or first if no title provided). Column also
 takes a block.
 
+### Internationalization
+
+To customize the internationalization for the component, specify a resource to
+use for translations via the `i18n` named parameter. This is only necessary for
+non-`ActiveRecord::Relation` collections:
+
+```ruby
+table_for payments, i18n: Payment do
+  # ...
+end
+```
+
 ## Status tag
 
 Status tags provide convenient syntactic sugar for styling items that have
@@ -150,6 +177,19 @@ status_tag 'active', class: 'important', id: 'status_123', label: 'on'
 # => <span class='status_tag active important' id='status_123'>on</span>
 ```
 
+When providing a `true` or `false` value, the `status_tag` will display "Yes"
+or "No". This can be configured through the `"en.active_admin.status_tag"`
+locale.
+
+```ruby
+status_tag true
+# => <span class='status_tag yes'>Yes</span>
+```
+
+In the case that a boolean field is `nil`, it will display "No" as a default.
+But using the `"en.active_admin.status_tag.unset"` locale key, it can be
+configured to display something else.
+
 ## Tabs
 
 The Tabs component is helpful for saving page real estate. The first tab will be

data/docs/13-authorization-adapter.md

@@ -10,8 +10,8 @@ taken. By default, '#authorized?' returns true.
 
 ## Setting up your own AuthorizationAdapter
 
-Setting up your own `AuthorizationAdapter` is easy! The following example shows
-how to set up and tie your authorization adapter class to Active Admin:
+The following example shows how to set up and tie your authorization
+adapter class to Active Admin:
 
 ```ruby
 # app/models/only_authors_authorization.rb
@@ -41,6 +41,9 @@ application's `config/initializers/active_admin.rb` and add/modify the line:
 config.authorization_adapter = "OnlyAuthorsAuthorization"
 ```
 
+Now, whenever a controller action is performed, the `OnlyAuthorsAuthorization`'s
+`#authorized?` method will be called.
+
 Authorization adapters can be configured per ActiveAdmin namespace as well, for
 example:
 
@@ -55,9 +58,6 @@ ActiveAdmin.setup do |config|
 end
 ```
 
-Now, whenever a controller action is performed, the `OnlyAuthorsAuthorization`'s
-`#authorized?` method will be called.
-
 ## Getting Access to the Current User
 
 From within your authorization adapter, you can call the `#user` method to
@@ -136,7 +136,7 @@ Each of these actions is available as a constant. Eg: `:read` is available as
 Active Admin provides a helper method to check if the current user is
 authorized to perform an action on a subject.
 
-Simply use the `#authorized?(action, subject)` method to check.
+Use the `#authorized?(action, subject)` method to check.
 
 ```ruby
 ActiveAdmin.register Post do
@@ -180,10 +180,9 @@ end
 
 Sub-classing `ActiveAdmin::AuthorizationAdapter` is fairly low level. Many times
 it's nicer to have a simpler DSL for managing authorization. Active Admin
-provides an adapter out of the box for [CanCan](https://github.com/ryanb/cancan)
-and [CanCanCan](https://github.com/CanCanCommunity/cancancan).
+provides an adapter out of the box for [CanCanCan](https://github.com/CanCanCommunity/cancancan).
 
-To use the CanCan adapter, simply update the configuration in the Active Admin
+To use the CanCan adapter, update the configuration in the Active Admin
 initializer:
 
 ```ruby
@@ -221,7 +220,7 @@ changed from the initializer:
 config.cancan_ability_class = "MyCustomAbility"
 ```
 
-Now you can simply use CanCan or CanCanCan the way that you would expect and
+Now you can simply use CanCanCan the way that you would expect and
 Active Admin will use it for authorization:
 
 ```ruby
@@ -233,34 +232,54 @@ class Ability
     can :manage, Post
     can :read, User
     can :manage, User, id: user.id
-    can :read, ActiveAdmin::Page, name: "Dashboard", namespace_name: :admin
+    can :read, ActiveAdmin::Page, name: "Dashboard", namespace_name: "admin"
   end
 
 end
 ```
 
 To view more details about the API's, visit project pages of
-[CanCan](https://github.com/ryanb/cancan) and
 [CanCanCan](https://github.com/CanCanCommunity/cancancan).
 
 ## Using the Pundit Adapter
 
-Active Admin provides an adapter out of the box also for
-[Pundit](https://github.com/elabs/pundit).
+Active Admin also provides an adapter out of the box for
+[Pundit](https://github.com/varvet/pundit).
 
-To use the Pundit adapter, simply update the configuration in the Active Admin
+To use the Pundit adapter, update the configuration in the Active Admin
 initializer:
 
 ```ruby
 config.authorization_adapter = ActiveAdmin::PunditAdapter
 ```
 
-You can simply use Pundit the way that you would expect and Active Admin will
-use it for authorization. Check Pundit's documentation to [set up Pundit in your
-application](https://github.com/elabs/pundit#installation). If you want to use
-batch actions just ensure that `destroy_all?` method is defined in your policy
-class. You can use this [template
+Once that's done, Active Admin will pick up your Pundit policies, and use
+them for authorization. For more information about setting up Pundit, see
+[their documentation](https://github.com/varvet/pundit#installation).
+
+Pundit also has [verify_authorized and/or verify_policy_scoped
+methods](https://github.com/varvet/pundit#ensuring-policies-and-scopes-are-used)
+to enforce usage of `authorized` and `policy_scope`. This conflicts with Active
+Admin's authorization architecture, so if you're using those features, you'll
+want to disable them for Active Admin's controllers:
+
+```ruby
+class ApplicationController < ActionController::Base
+  include Pundit
+  after_action :verify_authorized, except: :index, unless: :active_admin_controller?
+  after_action :verify_policy_scoped, only: :index, unless: :active_admin_controller?
+
+  def active_admin_controller?
+    is_a?(ActiveAdmin::BaseController)
+  end
+end
+```
+
+If you want to use batch actions, ensure that `destroy_all?` method is defined
+in your policy class. You can use this [template
 policy](https://github.com/activeadmin/activeadmin/blob/master/spec/support/templates/policies/application_policy.rb)
-in your application instead of default one generated by Pundit's `rails g
-pundit:install` command.
+in your application instead of default one generated by Pundit's
+`rails g pundit:install` command.
 
+In addition, there are [example policies](https://github.com/activeadmin/activeadmin/tree/master/spec/support/templates/policies/active_admin)
+for restricting access to ActiveAdmin's pages and comments.

data/docs/2-resource-customization.md

@@ -10,7 +10,7 @@ resource you must first create a Rails model for it.
 ## Create a Resource
 
 The basic command for creating a resource is `rails g active_admin:resource Post`.
-The generator will produce an empty `app/admin/post.rb` file like so:
+The generator will produce an empty `app/admin/posts.rb` file like so:
 
 ```ruby
 ActiveAdmin.register Post do
@@ -116,10 +116,15 @@ config/locales/[en].yml:
 en:
   active_admin:
     resources:
-      offer:
-        new_model: 'Make an Offer'
+      offer: # Registered resource
+        new_model: 'Make an Offer' # new action item
+        edit_model: 'Change Offer' # edit action item
+        delete_model: 'Cancel Offer' # delete action item
 ```
 
+See the [default en.yml](/config/locales/en.yml) locale file for
+existing translations and examples.
+
 ## Rename the Resource
 
 By default, any references to the resource (menu, routes, buttons, etc) in the
@@ -320,7 +325,7 @@ end
 
 ## Eager loading
 
-A common way to increase page performance is to elimate N+1 queries by eager
+A common way to increase page performance is to eliminate N+1 queries by eager
 loading associations:
 
 ```ruby
@@ -350,7 +355,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/custom-index.md

@@ -30,6 +30,6 @@ The build method takes a PagePresenter object and collection of whatever you
 choose.
 
 The `index_name` class method takes no arguments and returns a string that should
-be representative of the the class name. If this method is not defined, your
+be representative of the class name. If this method is not defined, your
 index component will not be able take advantage of Active Admin's
 *multiple index pages* feature.

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

@@ -28,7 +28,7 @@ end
 ```
 
 Second, you can pass a block to the tile option which will then be
-used as the contents fo the title. The resource being rendered
+used as the contents of the title. The resource being rendered
 is passed in to the block. For Example:
 
 ```ruby

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

@@ -111,7 +111,8 @@ index do
 end
 ```
 
-In addition, you can insert the position of the row in the greater collection by using the index_column special command:
+In addition, you can insert the position of the row in the greater
+collection by using the index_column special command:
 
 ```ruby
 index do
@@ -121,7 +122,8 @@ index do
 end
 ```
 
-index_column take an optional offset parameter to allow a developer to set the starting number for the index (default is 1).
+index_column take an optional offset parameter to allow a developer to set
+the starting number for the index (default is 1).
 
 ## Sorting
 
@@ -129,9 +131,7 @@ When a column is generated from an Active Record attribute, the table is
 sortable by default. If you are creating a custom column, you may need to give
 Active Admin a hint for how to sort the table.
 
-If a column is defined using a block, you must pass the key to turn on sorting. The key
-is the attribute which gets used to sort objects using Active Record.
-
+You can pass the key specifying the attribute which gets used to sort objects using Active Record.
 By default, this is the column on the resource's table that the attribute corresponds to.
 Otherwise, any attribute that the resource collection responds to can be used.
 
@@ -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

@@ -214,6 +214,23 @@ end
 Scopes can be labelled with a translation, e.g.
 `activerecord.scopes.invoice.expired`.
 
+### Scopes groups
+
+You can assign group names to scopes to keep related scopes together and separate them from the rest.
+
+```ruby
+# a scope in the default group
+scope :all
+
+# two scopes used to filter by status
+scope :active, group: :status
+scope :inactive, group: :status
+
+# two scopes used to filter by date
+scope :today, group: :date
+scope :tomorrow, group: :date
+```
+
 ## Index default sort order
 
 You can define the default sort order for index pages: