activeadmin 2.4.0 → 2.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of activeadmin might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CHANGELOG.md +422 -31
- data/CONTRIBUTING.md +44 -65
- data/README.md +6 -6
- data/app/assets/javascripts/active_admin/base.js +521 -0
- data/app/assets/stylesheets/active_admin/_base.scss +53 -37
- data/app/assets/stylesheets/active_admin/_forms.scss +1 -11
- data/app/assets/stylesheets/active_admin/_header.scss +40 -8
- data/app/assets/stylesheets/active_admin/_mixins.scss +1 -1
- data/{vendor → app}/assets/stylesheets/active_admin/_normalize.scss +25 -123
- data/app/assets/stylesheets/active_admin/{print.scss → _print.scss} +2 -2
- data/app/assets/stylesheets/active_admin/components/_comments.scss +2 -2
- data/app/assets/stylesheets/active_admin/components/_date_picker.scss +1 -2
- data/app/assets/stylesheets/active_admin/components/_dropdown_menu.scss +0 -1
- data/app/assets/stylesheets/active_admin/components/_tables.scss +1 -2
- data/app/assets/stylesheets/active_admin/mixins/_all.scss +8 -8
- data/app/assets/stylesheets/active_admin/mixins/_variables.scss +17 -0
- data/app/assets/stylesheets/active_admin/structure/_footer.scss +6 -1
- data/app/assets/stylesheets/active_admin/structure/_main_structure.scss +1 -1
- data/app/assets/stylesheets/active_admin/structure/_title_bar.scss +0 -1
- data/app/javascript/active_admin/base.js +28 -0
- data/app/{assets/javascripts/active_admin/lib/batch_actions.es6 → javascript/active_admin/initializers/batch-actions.js} +4 -2
- data/app/javascript/active_admin/initializers/checkbox-toggler.js +3 -0
- data/app/javascript/active_admin/initializers/dropdown-menu.js +9 -0
- data/app/javascript/active_admin/initializers/filters.js +10 -0
- data/app/{assets/javascripts/active_admin/lib/has_many.es6 → javascript/active_admin/initializers/has-many.js} +4 -1
- data/app/javascript/active_admin/initializers/per-page.js +13 -0
- data/app/javascript/active_admin/initializers/table-checkbox-toggler.js +3 -0
- data/app/{assets/javascripts/active_admin/lib/checkbox-toggler.es6 → javascript/active_admin/lib/checkbox-toggler.js} +5 -5
- data/app/{assets/javascripts/active_admin/lib/dropdown-menu.es6 → javascript/active_admin/lib/dropdown-menu.js} +3 -10
- data/app/javascript/active_admin/lib/filters.js +39 -0
- data/app/{assets/javascripts/active_admin/lib/modal_dialog.es6 → javascript/active_admin/lib/modal-dialog.js} +10 -8
- data/app/javascript/active_admin/lib/per-page.js +38 -0
- data/app/{assets/javascripts/active_admin/lib/table-checkbox-toggler.es6 → javascript/active_admin/lib/table-checkbox-toggler.js} +5 -3
- data/app/javascript/active_admin/lib/utils.js +40 -0
- data/app/views/active_admin/devise/mailer/reset_password_instructions.html.erb +1 -1
- data/app/views/active_admin/devise/mailer/unlock_instructions.html.erb +2 -2
- data/app/views/active_admin/devise/shared/_links.erb +1 -1
- data/app/views/active_admin/page/index.html.arb +1 -0
- data/app/views/active_admin/resource/edit.html.arb +1 -0
- data/app/views/active_admin/resource/index.html.arb +1 -0
- data/app/views/active_admin/resource/new.html.arb +1 -0
- data/app/views/active_admin/resource/show.html.arb +1 -0
- data/app/views/layouts/active_admin.html.arb +1 -0
- data/app/views/layouts/active_admin_logged_out.html.erb +18 -7
- data/config/locales/ar.yml +6 -6
- data/config/locales/az.yml +138 -0
- data/config/locales/en-CA.yml +3 -3
- data/config/locales/en-GB.yml +3 -3
- data/config/locales/en.yml +3 -3
- data/config/locales/es-MX.yml +2 -1
- data/config/locales/es.yml +5 -5
- data/config/locales/fr.yml +7 -7
- data/config/locales/it.yml +18 -0
- data/config/locales/ja.yml +3 -3
- data/config/locales/ko.yml +1 -1
- data/config/locales/lv.yml +2 -2
- data/config/locales/nl.yml +1 -1
- data/config/locales/ro.yml +3 -2
- data/config/locales/vi.yml +40 -12
- data/config/locales/zh-CN.yml +36 -17
- data/lib/active_admin/abstract_view_factory.rb +1 -0
- data/lib/active_admin/application.rb +20 -20
- data/lib/active_admin/application_settings.rb +4 -3
- data/lib/active_admin/asset_registration.rb +4 -3
- data/lib/active_admin/authorization_adapter.rb +6 -3
- data/lib/active_admin/base_controller/authorization.rb +15 -13
- data/lib/active_admin/base_controller/menu.rb +1 -0
- data/lib/active_admin/base_controller.rb +6 -5
- data/lib/active_admin/batch_actions/controller.rb +4 -3
- data/lib/active_admin/batch_actions/resource_extension.rb +10 -8
- data/lib/active_admin/batch_actions/views/batch_action_form.rb +4 -3
- data/lib/active_admin/batch_actions/views/batch_action_selector.rb +7 -6
- data/lib/active_admin/batch_actions/views/selection_cells.rb +4 -3
- data/lib/active_admin/batch_actions.rb +1 -0
- data/lib/active_admin/callbacks.rb +1 -0
- data/lib/active_admin/cancan_adapter.rb +2 -1
- data/lib/active_admin/collection_decorator.rb +32 -0
- data/lib/active_admin/component.rb +1 -0
- data/lib/active_admin/controller_action.rb +1 -0
- data/lib/active_admin/csv_builder.rb +12 -21
- data/lib/active_admin/dependency.rb +12 -15
- data/lib/active_admin/deprecation.rb +1 -0
- data/lib/active_admin/devise.rb +16 -5
- data/lib/active_admin/dsl.rb +2 -1
- data/lib/active_admin/dynamic_setting.rb +1 -0
- data/lib/active_admin/dynamic_settings_node.rb +3 -2
- data/lib/active_admin/engine.rb +13 -9
- data/lib/active_admin/error.rb +1 -2
- data/lib/active_admin/filters/active.rb +2 -1
- data/lib/active_admin/filters/active_filter.rb +7 -7
- data/lib/active_admin/filters/active_sidebar.rb +4 -30
- data/lib/active_admin/filters/dsl.rb +1 -0
- data/lib/active_admin/filters/forms.rb +7 -6
- data/lib/active_admin/filters/formtastic_addons.rb +2 -6
- data/lib/active_admin/filters/resource_extension.rb +6 -5
- data/lib/active_admin/filters.rb +8 -7
- data/lib/active_admin/form_builder.rb +25 -20
- data/lib/active_admin/generators/boilerplate.rb +2 -1
- data/lib/active_admin/helpers/collection.rb +2 -0
- data/lib/active_admin/helpers/i18n.rb +1 -0
- data/lib/active_admin/helpers/optional_display.rb +3 -2
- data/lib/active_admin/helpers/routes/url_helpers.rb +1 -0
- data/lib/active_admin/helpers/scope_chain.rb +1 -0
- data/lib/active_admin/inputs/datepicker_input.rb +2 -1
- data/lib/active_admin/inputs/filters/base/search_method_select.rb +5 -4
- data/lib/active_admin/inputs/filters/base.rb +2 -1
- data/lib/active_admin/inputs/filters/boolean_input.rb +2 -1
- data/lib/active_admin/inputs/filters/check_boxes_input.rb +2 -1
- data/lib/active_admin/inputs/filters/date_picker_input.rb +1 -0
- data/lib/active_admin/inputs/filters/date_range_input.rb +16 -12
- data/lib/active_admin/inputs/filters/numeric_input.rb +1 -0
- data/lib/active_admin/inputs/filters/select_input.rb +3 -2
- data/lib/active_admin/inputs/filters/string_input.rb +1 -0
- data/lib/active_admin/inputs/filters/text_input.rb +1 -0
- data/lib/active_admin/inputs.rb +1 -0
- data/lib/active_admin/localizers/resource_localizer.rb +4 -3
- data/lib/active_admin/localizers.rb +2 -1
- data/lib/active_admin/menu.rb +7 -3
- data/lib/active_admin/menu_collection.rb +1 -0
- data/lib/active_admin/menu_item.rb +8 -7
- data/lib/active_admin/namespace.rb +15 -14
- data/lib/active_admin/namespace_settings.rb +9 -5
- data/lib/active_admin/order_clause.rb +2 -1
- data/lib/active_admin/orm/active_record/comments/comment.rb +4 -3
- data/lib/active_admin/orm/active_record/comments/namespace_helper.rb +1 -0
- data/lib/active_admin/orm/active_record/comments/resource_helper.rb +1 -0
- data/lib/active_admin/orm/active_record/comments/show_page_helper.rb +1 -0
- data/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb +21 -20
- data/lib/active_admin/orm/active_record/comments/views.rb +3 -2
- data/lib/active_admin/orm/active_record/comments.rb +28 -27
- data/lib/active_admin/orm/active_record.rb +2 -1
- data/lib/active_admin/orm/mongoid.rb +1 -0
- data/lib/active_admin/page.rb +2 -1
- data/lib/active_admin/page_controller.rb +1 -0
- data/lib/active_admin/page_dsl.rb +1 -0
- data/lib/active_admin/page_presenter.rb +1 -0
- data/lib/active_admin/pundit_adapter.rb +57 -15
- data/lib/active_admin/resource/action_items.rb +6 -5
- data/lib/active_admin/resource/attributes.rb +2 -1
- data/lib/active_admin/resource/belongs_to.rb +3 -2
- data/lib/active_admin/resource/controllers.rb +2 -1
- data/lib/active_admin/resource/includes.rb +1 -0
- data/lib/active_admin/resource/menu.rb +5 -4
- data/lib/active_admin/resource/model.rb +1 -0
- data/lib/active_admin/resource/naming.rb +6 -5
- data/lib/active_admin/resource/ordering.rb +1 -0
- data/lib/active_admin/resource/page_presenters.rb +1 -0
- data/lib/active_admin/resource/pagination.rb +1 -0
- data/lib/active_admin/resource/routes.rb +6 -7
- data/lib/active_admin/resource/scope_to.rb +8 -7
- data/lib/active_admin/resource/scopes.rb +1 -0
- data/lib/active_admin/resource/sidebars.rb +2 -1
- data/lib/active_admin/resource.rb +21 -20
- data/lib/active_admin/resource_collection.rb +1 -0
- data/lib/active_admin/resource_controller/action_builder.rb +1 -0
- data/lib/active_admin/resource_controller/data_access.rb +31 -5
- data/lib/active_admin/resource_controller/decorators.rb +7 -28
- data/lib/active_admin/resource_controller/polymorphic_routes.rb +4 -2
- data/lib/active_admin/resource_controller/resource_class_methods.rb +1 -0
- data/lib/active_admin/resource_controller/scoping.rb +1 -0
- data/lib/active_admin/resource_controller/sidebars.rb +1 -0
- data/lib/active_admin/resource_controller/streaming.rb +9 -7
- data/lib/active_admin/resource_controller.rb +13 -11
- data/lib/active_admin/resource_dsl.rb +11 -25
- data/lib/active_admin/router.rb +1 -0
- data/lib/active_admin/scope.rb +7 -6
- data/lib/active_admin/settings_node.rb +1 -0
- data/lib/active_admin/sidebar_section.rb +1 -0
- data/lib/active_admin/version.rb +2 -1
- data/lib/active_admin/view_factory.rb +18 -17
- data/lib/active_admin/view_helpers/active_admin_application_helper.rb +1 -0
- data/lib/active_admin/view_helpers/auto_link_helper.rb +2 -1
- data/lib/active_admin/view_helpers/breadcrumb_helper.rb +4 -3
- data/lib/active_admin/view_helpers/display_helper.rb +15 -7
- data/lib/active_admin/view_helpers/download_format_links_helper.rb +2 -1
- data/lib/active_admin/view_helpers/fields_for.rb +3 -2
- data/lib/active_admin/view_helpers/flash_helper.rb +1 -0
- data/lib/active_admin/view_helpers/form_helper.rb +1 -0
- data/lib/active_admin/view_helpers/method_or_proc_helper.rb +1 -0
- data/lib/active_admin/view_helpers/scope_name_helper.rb +1 -0
- data/lib/active_admin/view_helpers/sidebar_helper.rb +1 -0
- data/lib/active_admin/view_helpers/title_helper.rb +1 -0
- data/lib/active_admin/view_helpers/view_factory_helper.rb +1 -0
- data/lib/active_admin/view_helpers.rb +2 -1
- data/lib/active_admin/views/action_items.rb +1 -0
- data/lib/active_admin/views/components/active_admin_form.rb +7 -6
- data/lib/active_admin/views/components/active_filters_sidebar_content.rb +59 -0
- data/lib/active_admin/views/components/attributes_table.rb +6 -5
- data/lib/active_admin/views/components/blank_slate.rb +2 -1
- data/lib/active_admin/views/components/columns.rb +1 -0
- data/lib/active_admin/views/components/dropdown_menu.rb +7 -9
- data/lib/active_admin/views/components/index_list.rb +4 -3
- data/lib/active_admin/views/components/menu.rb +2 -1
- data/lib/active_admin/views/components/menu_item.rb +5 -4
- data/lib/active_admin/views/components/paginated_collection.rb +20 -18
- data/lib/active_admin/views/components/panel.rb +2 -1
- data/lib/active_admin/views/components/scopes.rb +8 -5
- data/lib/active_admin/views/components/sidebar.rb +1 -0
- data/lib/active_admin/views/components/sidebar_section.rb +1 -0
- data/lib/active_admin/views/components/site_title.rb +2 -1
- data/lib/active_admin/views/components/status_tag.rb +12 -11
- data/lib/active_admin/views/components/table_for.rb +19 -17
- data/lib/active_admin/views/components/tabs.rb +4 -3
- data/lib/active_admin/views/components/unsupported_browser.rb +1 -0
- data/lib/active_admin/views/footer.rb +3 -1
- data/lib/active_admin/views/header.rb +3 -2
- data/lib/active_admin/views/index_as_block.rb +1 -0
- data/lib/active_admin/views/index_as_blog.rb +2 -1
- data/lib/active_admin/views/index_as_grid.rb +2 -1
- data/lib/active_admin/views/index_as_table.rb +17 -16
- data/lib/active_admin/views/pages/base.rb +22 -14
- data/lib/active_admin/views/pages/form.rb +1 -0
- data/lib/active_admin/views/pages/index.rb +16 -13
- data/lib/active_admin/views/pages/layout.rb +1 -0
- data/lib/active_admin/views/pages/page.rb +1 -0
- data/lib/active_admin/views/pages/show.rb +1 -0
- data/lib/active_admin/views/tabbed_navigation.rb +3 -2
- data/lib/active_admin/views/title_bar.rb +2 -1
- data/lib/active_admin/views.rb +2 -1
- data/lib/active_admin.rb +63 -64
- data/lib/activeadmin.rb +2 -1
- data/lib/generators/active_admin/assets/assets_generator.rb +3 -2
- data/lib/generators/active_admin/assets/templates/active_admin.scss +2 -2
- data/lib/generators/active_admin/devise/devise_generator.rb +6 -5
- data/lib/generators/active_admin/install/install_generator.rb +15 -8
- data/lib/generators/active_admin/install/templates/active_admin.rb.erb +26 -2
- data/lib/generators/active_admin/install/templates/dashboard.rb +1 -0
- data/lib/generators/active_admin/page/page_generator.rb +2 -1
- data/lib/generators/active_admin/page/templates/page.rb +1 -0
- data/lib/generators/active_admin/resource/resource_generator.rb +4 -3
- data/lib/generators/active_admin/webpacker/plugins/jquery.js +7 -0
- data/lib/generators/active_admin/webpacker/templates/active_admin.js +5 -0
- data/lib/generators/active_admin/webpacker/templates/active_admin.scss +17 -0
- data/lib/generators/active_admin/webpacker/templates/print.scss +2 -0
- data/lib/generators/active_admin/webpacker/webpacker_generator.rb +27 -0
- data/lib/ransack_ext.rb +9 -8
- metadata +56 -132
- data/app/assets/images/active_admin/nested_menu_arrow.gif +0 -0
- data/app/assets/images/active_admin/nested_menu_arrow_dark.gif +0 -0
- data/app/assets/images/active_admin/orderable.png +0 -0
- data/app/assets/javascripts/active_admin/base.es6 +0 -23
- data/app/assets/javascripts/active_admin/initializers/filters.es6 +0 -45
- data/app/assets/javascripts/active_admin/lib/active_admin.es6 +0 -41
- data/app/assets/javascripts/active_admin/lib/per_page.es6 +0 -47
- data/docs/.gitignore +0 -1
- data/docs/0-installation.md +0 -118
- data/docs/1-general-configuration.md +0 -204
- data/docs/10-custom-pages.md +0 -150
- data/docs/11-decorators.md +0 -59
- data/docs/12-arbre-components.md +0 -214
- data/docs/13-authorization-adapter.md +0 -285
- data/docs/14-gotchas.md +0 -138
- data/docs/2-resource-customization.md +0 -466
- data/docs/3-index-pages/custom-index.md +0 -35
- data/docs/3-index-pages/index-as-block.md +0 -19
- data/docs/3-index-pages/index-as-blog.md +0 -69
- data/docs/3-index-pages/index-as-grid.md +0 -27
- data/docs/3-index-pages/index-as-table.md +0 -234
- data/docs/3-index-pages.md +0 -328
- data/docs/4-csv-format.md +0 -74
- data/docs/5-forms.md +0 -232
- data/docs/6-show-pages.md +0 -81
- data/docs/7-sidebars.md +0 -75
- data/docs/8-custom-actions.md +0 -177
- data/docs/9-batch-actions.md +0 -237
- data/docs/CNAME +0 -1
- data/docs/Gemfile +0 -3
- data/docs/Gemfile.lock +0 -248
- data/docs/README.md +0 -24
- data/docs/_config.yml +0 -4
- data/docs/_includes/footer.html +0 -8
- data/docs/_includes/google-analytics.html +0 -16
- data/docs/_includes/head.html +0 -7
- data/docs/_includes/toc.html +0 -98
- data/docs/_includes/top-menu.html +0 -17
- data/docs/_layouts/default.html +0 -21
- data/docs/documentation.md +0 -60
- data/docs/images/activeadmin.png +0 -0
- data/docs/images/code-header.png +0 -0
- data/docs/images/divider.png +0 -0
- data/docs/images/features.png +0 -0
- data/docs/images/tidelift.svg +0 -14
- data/docs/index.html +0 -226
- data/docs/stylesheets/main.css +0 -1205
- /data/app/{assets/javascripts/active_admin/ext/jquery-ui.es6 → javascript/active_admin/ext/jquery-ui.js} +0 -0
- /data/app/{assets/javascripts/active_admin/ext/jquery.es6 → javascript/active_admin/ext/jquery.js} +0 -0
- /data/app/{assets/javascripts/active_admin/initializers/datepicker.es6 → javascript/active_admin/initializers/datepicker.js} +0 -0
- /data/app/{assets/javascripts/active_admin/initializers/tabs.es6 → javascript/active_admin/initializers/tabs.js} +0 -0
data/config/locales/fr.yml
CHANGED
@@ -7,7 +7,7 @@ fr:
|
|
7
7
|
view: "Voir"
|
8
8
|
edit: "Modifier"
|
9
9
|
delete: "Supprimer"
|
10
|
-
delete_confirmation: "
|
10
|
+
delete_confirmation: "Voulez-vous vraiment supprimer ceci ?"
|
11
11
|
create_another: "Créer autre %{model}"
|
12
12
|
new_model: "Créer %{model}"
|
13
13
|
edit_model: "Modifier %{model}"
|
@@ -38,9 +38,9 @@ fr:
|
|
38
38
|
to: "À"
|
39
39
|
search_status:
|
40
40
|
headline: "Statut de la recherche :"
|
41
|
-
current_scope: "
|
41
|
+
current_scope: "Périmètre :"
|
42
42
|
current_filters: "Filtres actuels :"
|
43
|
-
no_current_filters: "Aucun
|
43
|
+
no_current_filters: "Aucun filtre"
|
44
44
|
status_tag:
|
45
45
|
"yes": "Oui"
|
46
46
|
"no": "Non"
|
@@ -52,7 +52,7 @@ fr:
|
|
52
52
|
filters: "Filtres"
|
53
53
|
search_status: "Statut de la recherche"
|
54
54
|
pagination:
|
55
|
-
empty: "Aucun %{model} trouvé"
|
55
|
+
empty: "Aucun(e) %{model} trouvé(e)"
|
56
56
|
one: "Affichage de <b>1</b> %{model}"
|
57
57
|
one_page: "Affichage des <b>%{n}</b> %{model}"
|
58
58
|
multiple: "Affichage de %{model} <b>%{from} - %{to}</b> sur un total de <b>%{total}</b>"
|
@@ -69,8 +69,8 @@ fr:
|
|
69
69
|
button_label: "Actions"
|
70
70
|
batch_actions:
|
71
71
|
button_label: "Actions groupées"
|
72
|
-
default_confirmation: "
|
73
|
-
delete_confirmation: "
|
72
|
+
default_confirmation: "Voulez-vous vraiment faire cela ?"
|
73
|
+
delete_confirmation: "Voulez-vous vraiment supprimer ces %{plural_model} ?"
|
74
74
|
succesfully_destroyed:
|
75
75
|
one: "1 %{model} supprimé"
|
76
76
|
other: "%{count} %{plural_model} supprimés"
|
@@ -86,7 +86,7 @@ fr:
|
|
86
86
|
author: "Auteur"
|
87
87
|
add: "Ajouter un commentaire"
|
88
88
|
delete: "Supprimer ce commentaire"
|
89
|
-
delete_confirmation: "
|
89
|
+
delete_confirmation: "Voulez-vous vraiment supprimer ce commentaire ?"
|
90
90
|
resource: "Ressource"
|
91
91
|
no_comments_yet: "Aucun commentaire actuellement"
|
92
92
|
author_missing: "Anonyme"
|
data/config/locales/it.yml
CHANGED
@@ -1,4 +1,20 @@
|
|
1
1
|
it:
|
2
|
+
activerecord:
|
3
|
+
models:
|
4
|
+
comment:
|
5
|
+
one: "Commento"
|
6
|
+
other: "Commenti"
|
7
|
+
active_admin/comment:
|
8
|
+
one: "Commento"
|
9
|
+
other: "Commenti"
|
10
|
+
attributes:
|
11
|
+
active_admin/comment:
|
12
|
+
author_type: "Tipo di Autore"
|
13
|
+
body: "Corpo"
|
14
|
+
created_at: "Creato il"
|
15
|
+
namespace: "Namespace"
|
16
|
+
resource_type: "Tipo di risorsa"
|
17
|
+
updated_at: "Aggiornato il"
|
2
18
|
active_admin:
|
3
19
|
dashboard: Dashboard
|
4
20
|
dashboard_welcome:
|
@@ -37,6 +53,8 @@ it:
|
|
37
53
|
lteq_datetime: "Minore o uguale a"
|
38
54
|
from: "Da"
|
39
55
|
to: "A"
|
56
|
+
scopes:
|
57
|
+
all: "Tutti"
|
40
58
|
search_status:
|
41
59
|
headline: "Situazione filtri:"
|
42
60
|
current_scope: "Contesto selezionato:"
|
data/config/locales/ja.yml
CHANGED
@@ -8,7 +8,7 @@ ja:
|
|
8
8
|
edit: "編集"
|
9
9
|
delete: "削除"
|
10
10
|
delete_confirmation: "本当に削除しますか?"
|
11
|
-
create_another: "%{model}
|
11
|
+
create_another: "%{model} を続けて作成する"
|
12
12
|
new_model: "%{model} を作成する"
|
13
13
|
edit_model: "%{model} を編集する"
|
14
14
|
delete_model: "%{model} を削除する"
|
@@ -18,7 +18,7 @@ ja:
|
|
18
18
|
previous: "前"
|
19
19
|
next: "次"
|
20
20
|
download: "ダウンロード:"
|
21
|
-
has_many_new: "
|
21
|
+
has_many_new: "%{model} を追加する"
|
22
22
|
has_many_delete: "削除する"
|
23
23
|
has_many_remove: "削除する"
|
24
24
|
filters:
|
@@ -26,7 +26,7 @@ ja:
|
|
26
26
|
filter: "絞り込む"
|
27
27
|
clear: "条件を削除する"
|
28
28
|
predicates:
|
29
|
-
contains: "
|
29
|
+
contains: "を含む"
|
30
30
|
equals: "等しい"
|
31
31
|
starts_with: "で始まる"
|
32
32
|
ends_with: "で終わる"
|
data/config/locales/ko.yml
CHANGED
data/config/locales/lv.yml
CHANGED
@@ -60,8 +60,8 @@ lv:
|
|
60
60
|
default_confirmation: "Vai tiešām vēlaties to darīt?"
|
61
61
|
delete_confirmation: "Vai tiešām vēlaties dzēst šos %{plural_model}?"
|
62
62
|
succesfully_destroyed:
|
63
|
-
one: "Successfully
|
64
|
-
other: "Successfully
|
63
|
+
one: "Successfully deleted 1 %{model}"
|
64
|
+
other: "Successfully deleted %{count} %{plural_model}"
|
65
65
|
selection_toggle_explanation: "(Toggle Selection)"
|
66
66
|
action_label: "%{title} Selected"
|
67
67
|
labels:
|
data/config/locales/nl.yml
CHANGED
@@ -114,7 +114,7 @@ nl:
|
|
114
114
|
submit: "inloggen"
|
115
115
|
reset_password:
|
116
116
|
title: "Wachtwoord vergeten?"
|
117
|
-
submit: "Reset mijn wachtwoord
|
117
|
+
submit: "Reset mijn wachtwoord"
|
118
118
|
change_password:
|
119
119
|
title: "Wijzig uw wachtwoord"
|
120
120
|
submit: "Mijn wachtwoord wijzigen"
|
data/config/locales/ro.yml
CHANGED
@@ -47,8 +47,9 @@ ro:
|
|
47
47
|
multiple: "Sunt afisate <b>%{from} - %{to}</b> din <b>%{total}</b> inregistrari"
|
48
48
|
multiple_without_total: "Sunt afisate <b>%{from} - %{to}</b>"
|
49
49
|
entry:
|
50
|
-
one: "
|
51
|
-
|
50
|
+
one: "înregistrăre"
|
51
|
+
few: "înregistrări"
|
52
|
+
other: "înregistrări"
|
52
53
|
any: "Oricare"
|
53
54
|
blank_slate:
|
54
55
|
content: "Momentan nu exista %{resource_name}."
|
data/config/locales/vi.yml
CHANGED
@@ -1,25 +1,43 @@
|
|
1
1
|
vi:
|
2
|
+
activerecord:
|
3
|
+
models:
|
4
|
+
comment:
|
5
|
+
one: "Bình luận"
|
6
|
+
other: "Các bình luận"
|
7
|
+
active_admin/comment:
|
8
|
+
one: "Bình luận"
|
9
|
+
other: "Các bình luận"
|
10
|
+
attributes:
|
11
|
+
active_admin/comment:
|
12
|
+
author_type: "Loại tác giả"
|
13
|
+
body: "Nội dung"
|
14
|
+
created_at: "Đã tạo"
|
15
|
+
namespace: "Namespace"
|
16
|
+
resource_type: "Resource type"
|
17
|
+
updated_at: "Đã cập nhật"
|
2
18
|
active_admin:
|
3
19
|
dashboard: Bảng điều khiển
|
4
20
|
dashboard_welcome:
|
5
21
|
welcome: "Chào mừng bạn đến với Active Admin. Đây là trang điều khiển mặc định."
|
6
|
-
call_to_action: "Để thêm
|
22
|
+
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'"
|
7
23
|
view: "Xem"
|
8
24
|
edit: "Chỉnh sửa"
|
9
25
|
delete: "Xóa"
|
10
|
-
delete_confirmation: "Bạn có chắc chắn rằng mình muốn xóa
|
26
|
+
delete_confirmation: "Bạn có chắc chắn rằng mình muốn xóa không?"
|
11
27
|
new_model: "Tạo mới %{model}"
|
12
28
|
edit_model: "Chỉnh sửa %{model}"
|
13
29
|
delete_model: "Xóa %{model}"
|
30
|
+
create_another: "Tạo thêm %{model}"
|
14
31
|
details: "%{model} Chi tiết"
|
15
32
|
cancel: "Hủy"
|
16
33
|
empty: "Trống"
|
17
34
|
previous: "Trước"
|
18
|
-
next: "
|
19
|
-
download: "
|
35
|
+
next: "Sau"
|
36
|
+
download: "Tải về:"
|
20
37
|
has_many_new: "Thêm mới %{model}"
|
21
38
|
has_many_delete: "Xóa"
|
22
39
|
has_many_remove: "Hủy bỏ"
|
40
|
+
move: "Di chuyển"
|
23
41
|
filters:
|
24
42
|
buttons:
|
25
43
|
filter: "Lọc"
|
@@ -28,17 +46,19 @@ vi:
|
|
28
46
|
contains: "Có chứa"
|
29
47
|
equals: "Bằng"
|
30
48
|
starts_with: "Bắt đầu với"
|
31
|
-
ends_with: "Kết thúc
|
49
|
+
ends_with: "Kết thúc bởi"
|
32
50
|
greater_than: "Lớn hơn"
|
33
51
|
less_than: "Nhỏ hơn"
|
34
52
|
gteq_datetime: "Lớn hơn hoặc bằng"
|
35
53
|
lteq_datetime: "Nhỏ hơn hoặc bằng"
|
36
54
|
from: "Từ"
|
37
55
|
to: "Đến"
|
56
|
+
scopes:
|
57
|
+
all: "Tất cả"
|
38
58
|
search_status:
|
39
59
|
headline: "Danh sách tìm kiếm:"
|
40
60
|
current_scope: "Phạm vi:"
|
41
|
-
current_filters: "Bộ
|
61
|
+
current_filters: "Bộ lọc hiện tại:"
|
42
62
|
no_current_filters: "Không có"
|
43
63
|
status_tag:
|
44
64
|
"yes": "Có"
|
@@ -46,7 +66,7 @@ vi:
|
|
46
66
|
"unset": "Không Có"
|
47
67
|
main_content: "Xin bổ sung %{model}#main_content để hiển thị nội dung."
|
48
68
|
logout: "Đăng xuất"
|
49
|
-
powered_by: "
|
69
|
+
powered_by: "Bản quyền bởi %{active_admin} %{version}"
|
50
70
|
sidebars:
|
51
71
|
filters: "Bộ Lọc"
|
52
72
|
search_status: "Trạng thái tìm kiếm"
|
@@ -74,12 +94,13 @@ vi:
|
|
74
94
|
one: "Đã xóa thành công 1 %{model}"
|
75
95
|
other: "Đã xóa thành công %{count} %{plural_model}"
|
76
96
|
selection_toggle_explanation: "(Thay đổi lựa chọn)"
|
77
|
-
action_label: "%{title} được chọn"
|
97
|
+
action_label: "%{title} đã được chọn"
|
78
98
|
labels:
|
79
99
|
destroy: "Xóa"
|
80
100
|
comments:
|
81
101
|
created_at: "Đã tạo"
|
82
102
|
resource_type: "Resource Type"
|
103
|
+
author_type: "Loại tác giả"
|
83
104
|
body: "Nội dung"
|
84
105
|
author: "Tác giả"
|
85
106
|
add: "Thêm bình luận"
|
@@ -116,15 +137,22 @@ vi:
|
|
116
137
|
title: "Thay đổi mật khẩu của bạn"
|
117
138
|
submit: "Thay đổi mật khẩu của tôi"
|
118
139
|
unlock:
|
119
|
-
title: "
|
120
|
-
submit: "
|
140
|
+
title: "Gửi lại hướng dẫn mở khoá"
|
141
|
+
submit: "Gửi lại hướng dẫn mở khoá"
|
121
142
|
resend_confirmation_instructions:
|
122
|
-
title: "
|
123
|
-
submit: "
|
143
|
+
title: "Gửi lại hướng dẫn xác nhận"
|
144
|
+
submit: "Gửi lại hướng dẫn xác nhận"
|
124
145
|
links:
|
146
|
+
sign_up: "Đăng ký"
|
125
147
|
sign_in: "Đăng nhập"
|
126
148
|
forgot_your_password: "Quên mật khẩu của bạn?"
|
127
149
|
sign_in_with_omniauth_provider: "Đăng nhập với %{provider}"
|
150
|
+
resend_unlock_instructions: "Gửi lại hướng dẫn mở khoá"
|
151
|
+
resend_confirmation_instructions: "Gửi lại hướng dẫn xác nhận"
|
152
|
+
unsupported_browser:
|
153
|
+
headline: "Vui lòng lưu ý rằng ActiveAdmin không còn hỗ trợ trên Internet Explorer các phiên bản 8 và thấp hơn."
|
154
|
+
recommendation: "Chúng tôi khuyên bạn hãy vào <a href=\"http://browsehappy.com/\">nâng cấp trình duyệt của bạn </a> để cải thiện trải nghiệm của bạn."
|
155
|
+
turn_off_compatibility_view: "Nếu bạn đang sử dụng IE 9 hoặc mới hơn, hãy chắc chắn bạn <a href=\"https://support.microsoft.com/en-us/help/17471\">tắt \"Compatibility View\"</a>."
|
128
156
|
access_denied:
|
129
157
|
message: "Bạn không có quyền thực hiện tính năng này"
|
130
158
|
index_list:
|
data/config/locales/zh-CN.yml
CHANGED
@@ -1,4 +1,20 @@
|
|
1
1
|
"zh-CN":
|
2
|
+
activerecord:
|
3
|
+
models:
|
4
|
+
comment:
|
5
|
+
one: "评论"
|
6
|
+
other: "评论"
|
7
|
+
active_admin/comment:
|
8
|
+
one: "评论"
|
9
|
+
other: "评论"
|
10
|
+
attributes:
|
11
|
+
active_admin/comment:
|
12
|
+
author_type: "作者类型"
|
13
|
+
body: "内容"
|
14
|
+
created_at: "创建"
|
15
|
+
namespace: "Namespace"
|
16
|
+
resource_type: "Resource 类型"
|
17
|
+
updated_at: "更新"
|
2
18
|
active_admin:
|
3
19
|
dashboard: "控制面板"
|
4
20
|
dashboard_welcome:
|
@@ -8,8 +24,8 @@
|
|
8
24
|
edit: "编辑"
|
9
25
|
delete: "删除"
|
10
26
|
delete_confirmation: "确定删除?"
|
11
|
-
create_another: "
|
12
|
-
new_model: "
|
27
|
+
create_another: "新增另一个%{model}"
|
28
|
+
new_model: "新增%{model}"
|
13
29
|
edit_model: "编辑%{model}"
|
14
30
|
delete_model: "删除%{model}"
|
15
31
|
details: "%{model}详情"
|
@@ -17,10 +33,11 @@
|
|
17
33
|
empty: "未定义"
|
18
34
|
previous: "上一个"
|
19
35
|
next: "下一个"
|
20
|
-
download: "
|
21
|
-
has_many_new: "
|
36
|
+
download: "下载:"
|
37
|
+
has_many_new: "新增一个%{model}"
|
22
38
|
has_many_delete: "删除"
|
23
39
|
has_many_remove: "清除"
|
40
|
+
move: "移动"
|
24
41
|
filters:
|
25
42
|
buttons:
|
26
43
|
filter: "过滤"
|
@@ -28,26 +45,28 @@
|
|
28
45
|
predicates:
|
29
46
|
contains: "包含"
|
30
47
|
equals: "等于"
|
31
|
-
starts_with: "
|
32
|
-
ends_with: "
|
48
|
+
starts_with: "始于"
|
49
|
+
ends_with: "止于"
|
33
50
|
greater_than: "大于"
|
34
51
|
less_than: "小于"
|
35
52
|
gteq_datetime: "大于等于"
|
36
53
|
lteq_datetime: "小于等于"
|
37
54
|
from: "起"
|
38
55
|
to: "止"
|
56
|
+
scopes:
|
57
|
+
all: "所有"
|
39
58
|
search_status:
|
40
59
|
headline: "搜索条件:"
|
41
|
-
current_scope: "
|
60
|
+
current_scope: "范围:"
|
42
61
|
current_filters: "过滤条件:"
|
43
62
|
no_current_filters: "无"
|
44
63
|
status_tag:
|
45
64
|
"yes": "是"
|
46
65
|
"no": "否"
|
47
66
|
"unset": "否"
|
48
|
-
main_content: "请执行 %{model}#main_content
|
67
|
+
main_content: "请执行 %{model}#main_content 来显示内容。"
|
49
68
|
logout: "退出"
|
50
|
-
powered_by: "
|
69
|
+
powered_by: "构建程序为 %{active_admin} %{version}"
|
51
70
|
sidebars:
|
52
71
|
filters: "所有条件"
|
53
72
|
search_status: "搜索条件"
|
@@ -63,14 +82,14 @@
|
|
63
82
|
other: "条目"
|
64
83
|
any: "任何"
|
65
84
|
blank_slate:
|
66
|
-
content: "暂时还没有%{resource_name}
|
67
|
-
link: "
|
85
|
+
content: "暂时还没有%{resource_name}。"
|
86
|
+
link: "新增一个"
|
68
87
|
dropdown_actions:
|
69
|
-
button_label: "
|
88
|
+
button_label: "操作"
|
70
89
|
batch_actions:
|
71
90
|
button_label: "批处理"
|
72
|
-
default_confirmation: "
|
73
|
-
delete_confirmation: "你确定要删除这些%{plural_model}
|
91
|
+
default_confirmation: "你确定要这样做?"
|
92
|
+
delete_confirmation: "你确定要删除这些%{plural_model}?"
|
74
93
|
succesfully_destroyed:
|
75
94
|
one: "成功删除 1 %{model}"
|
76
95
|
other: "成功删除 %{count} %{plural_model}"
|
@@ -92,7 +111,7 @@
|
|
92
111
|
author_missing: "匿名"
|
93
112
|
title_content: "(%{count})条评论"
|
94
113
|
errors:
|
95
|
-
empty_text: "
|
114
|
+
empty_text: "评论保存失败,内空不能为空。"
|
96
115
|
devise:
|
97
116
|
username:
|
98
117
|
title: "用户名"
|
@@ -121,8 +140,8 @@
|
|
121
140
|
title: "重新发送送解锁命令"
|
122
141
|
submit: "重新发送送解锁命令"
|
123
142
|
resend_confirmation_instructions:
|
124
|
-
title: "
|
125
|
-
submit: "
|
143
|
+
title: " 重新发送确认说明"
|
144
|
+
submit: " 重新发送确认说明"
|
126
145
|
links:
|
127
146
|
sign_up: "注册"
|
128
147
|
sign_in: "登录"
|
@@ -1,6 +1,7 @@
|
|
1
|
-
|
2
|
-
require
|
3
|
-
require
|
1
|
+
# frozen_string_literal: true
|
2
|
+
require "active_admin/router"
|
3
|
+
require "active_admin/application_settings"
|
4
|
+
require "active_admin/namespace_settings"
|
4
5
|
|
5
6
|
module ActiveAdmin
|
6
7
|
class Application
|
@@ -45,8 +46,8 @@ module ActiveAdmin
|
|
45
46
|
include AssetRegistration
|
46
47
|
|
47
48
|
# Event that gets triggered on load of Active Admin
|
48
|
-
BeforeLoadEvent =
|
49
|
-
AfterLoadEvent
|
49
|
+
BeforeLoadEvent = "active_admin.application.before_load".freeze
|
50
|
+
AfterLoadEvent = "active_admin.application.after_load".freeze
|
50
51
|
|
51
52
|
# Runs before the app's AA initializer
|
52
53
|
def setup!
|
@@ -73,9 +74,9 @@ module ActiveAdmin
|
|
73
74
|
def namespace(name)
|
74
75
|
name ||= :root
|
75
76
|
|
76
|
-
namespace = namespaces[name] ||= begin
|
77
|
+
namespace = namespaces[name.to_sym] ||= begin
|
77
78
|
namespace = Namespace.new(self, name)
|
78
|
-
ActiveSupport::Notifications.
|
79
|
+
ActiveSupport::Notifications.instrument ActiveAdmin::Namespace::RegisterEvent, { active_admin_namespace: namespace }
|
79
80
|
namespace
|
80
81
|
end
|
81
82
|
|
@@ -111,10 +112,10 @@ module ActiveAdmin
|
|
111
112
|
# To reload everything simply call `ActiveAdmin.unload!`
|
112
113
|
def load!
|
113
114
|
unless loaded?
|
114
|
-
ActiveSupport::Notifications.
|
115
|
-
files.each { |file| load file }
|
116
|
-
namespace(default_namespace)
|
117
|
-
ActiveSupport::Notifications.
|
115
|
+
ActiveSupport::Notifications.instrument BeforeLoadEvent, { active_admin_application: self } # before_load hook
|
116
|
+
files.each { |file| load file } # load files
|
117
|
+
namespace(default_namespace) # init AA resources
|
118
|
+
ActiveSupport::Notifications.instrument AfterLoadEvent, { active_admin_application: self } # after_load hook
|
118
119
|
@@loaded = true
|
119
120
|
end
|
120
121
|
end
|
@@ -125,7 +126,7 @@ module ActiveAdmin
|
|
125
126
|
|
126
127
|
# Returns ALL the files to be loaded
|
127
128
|
def files
|
128
|
-
load_paths.flatten.compact.uniq.flat_map { |path| Dir["#{path}/**/*.rb"] }
|
129
|
+
load_paths.flatten.compact.uniq.flat_map { |path| Dir["#{path}/**/*.rb"].sort }
|
129
130
|
end
|
130
131
|
|
131
132
|
# Creates all the necessary routes for the ActiveAdmin configurations
|
@@ -144,13 +145,13 @@ module ActiveAdmin
|
|
144
145
|
|
145
146
|
# Adds before, around and after filters to all controllers.
|
146
147
|
# Example usage:
|
147
|
-
# ActiveAdmin.
|
148
|
+
# ActiveAdmin.before_action :authenticate_admin!
|
148
149
|
#
|
149
150
|
AbstractController::Callbacks::ClassMethods.public_instance_methods.
|
150
|
-
select { |m| m.match(/
|
151
|
+
select { |m| m.match(/_action\z/) }.each do |name|
|
151
152
|
define_method name do |*args, &block|
|
152
|
-
|
153
|
-
|
153
|
+
ActiveSupport.on_load(:active_admin_controller) do
|
154
|
+
public_send name, *args, &block
|
154
155
|
end
|
155
156
|
end
|
156
157
|
end
|
@@ -164,9 +165,8 @@ module ActiveAdmin
|
|
164
165
|
private
|
165
166
|
|
166
167
|
def register_default_assets
|
167
|
-
register_stylesheet
|
168
|
-
|
169
|
-
register_javascript 'active_admin.js'
|
168
|
+
register_stylesheet "active_admin.css", media: "all"
|
169
|
+
register_javascript "active_admin.js"
|
170
170
|
end
|
171
171
|
|
172
172
|
# Since app/admin is alphabetically before app/models, we have to remove it
|
@@ -176,7 +176,7 @@ module ActiveAdmin
|
|
176
176
|
# files from being loaded twice in production.
|
177
177
|
def remove_active_admin_load_paths_from_rails_autoload_and_eager_load
|
178
178
|
ActiveSupport::Dependencies.autoload_paths -= load_paths
|
179
|
-
Rails.application.config.eager_load_paths
|
179
|
+
Rails.application.config.eager_load_paths -= load_paths
|
180
180
|
end
|
181
181
|
|
182
182
|
# Hook into the Rails code reloading mechanism so that things are reloaded
|
@@ -1,4 +1,5 @@
|
|
1
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
require "active_admin/settings_node"
|
2
3
|
|
3
4
|
module ActiveAdmin
|
4
5
|
class ApplicationSettings < SettingsNode
|
@@ -15,7 +16,7 @@ module ActiveAdmin
|
|
15
16
|
# Load paths for admin configurations. Add folders to this load path
|
16
17
|
# to load up other resources for administration. External gems can
|
17
18
|
# include their paths in this load path to provide active_admin UIs
|
18
|
-
register :load_paths, [File.expand_path(
|
19
|
+
register :load_paths, [File.expand_path("app/admin", Rails.root)]
|
19
20
|
|
20
21
|
# Set default localize format for Date/Time values
|
21
22
|
register :localize_format, :long
|
@@ -34,7 +35,7 @@ module ActiveAdmin
|
|
34
35
|
:to_s ]
|
35
36
|
|
36
37
|
# To make debugging easier, by default don't stream in development
|
37
|
-
register :disable_streaming_in, [
|
38
|
+
register :disable_streaming_in, ["development"]
|
38
39
|
|
39
40
|
# Remove sensitive attributes from being displayed, made editable, or exported by default
|
40
41
|
register :filter_attributes, [:encrypted_password, :password, :password_confirmation]
|
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module ActiveAdmin
|
2
3
|
module AssetRegistration
|
3
4
|
|
@@ -13,12 +14,12 @@ module ActiveAdmin
|
|
13
14
|
stylesheets.clear
|
14
15
|
end
|
15
16
|
|
16
|
-
def register_javascript(
|
17
|
-
javascripts
|
17
|
+
def register_javascript(path, options = {})
|
18
|
+
javascripts[path] = options
|
18
19
|
end
|
19
20
|
|
20
21
|
def javascripts
|
21
|
-
@javascripts ||=
|
22
|
+
@javascripts ||= {}
|
22
23
|
end
|
23
24
|
|
24
25
|
def clear_javascripts!
|
@@ -1,10 +1,13 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module ActiveAdmin
|
2
3
|
|
3
4
|
# Default Authorization permissions for Active Admin
|
4
5
|
module Authorization
|
5
|
-
READ
|
6
|
-
|
7
|
-
|
6
|
+
READ = :read
|
7
|
+
NEW = :new
|
8
|
+
CREATE = :create
|
9
|
+
EDIT = :edit
|
10
|
+
UPDATE = :update
|
8
11
|
DESTROY = :destroy
|
9
12
|
end
|
10
13
|
|
@@ -1,15 +1,16 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module ActiveAdmin
|
2
3
|
class BaseController < ::InheritedResources::Base
|
3
4
|
module Authorization
|
4
5
|
extend ActiveSupport::Concern
|
5
6
|
|
6
7
|
ACTIONS_DICTIONARY = {
|
7
|
-
index:
|
8
|
-
show:
|
9
|
-
new:
|
10
|
-
create:
|
11
|
-
edit:
|
12
|
-
update:
|
8
|
+
index: ActiveAdmin::Authorization::READ,
|
9
|
+
show: ActiveAdmin::Authorization::READ,
|
10
|
+
new: ActiveAdmin::Authorization::NEW,
|
11
|
+
create: ActiveAdmin::Authorization::CREATE,
|
12
|
+
edit: ActiveAdmin::Authorization::EDIT,
|
13
|
+
update: ActiveAdmin::Authorization::UPDATE,
|
13
14
|
destroy: ActiveAdmin::Authorization::DESTROY
|
14
15
|
}
|
15
16
|
|
@@ -52,9 +53,10 @@ module ActiveAdmin
|
|
52
53
|
# an ActiveAdmin::AccessDenied.
|
53
54
|
def authorize!(action, subject = nil)
|
54
55
|
unless authorized? action, subject
|
55
|
-
raise ActiveAdmin::AccessDenied.new(
|
56
|
-
|
57
|
-
|
56
|
+
raise ActiveAdmin::AccessDenied.new(
|
57
|
+
current_active_admin_user,
|
58
|
+
action,
|
59
|
+
subject)
|
58
60
|
end
|
59
61
|
end
|
60
62
|
|
@@ -80,7 +82,7 @@ module ActiveAdmin
|
|
80
82
|
def active_admin_authorization_adapter
|
81
83
|
adapter = active_admin_namespace.authorization_adapter
|
82
84
|
if adapter.is_a? String
|
83
|
-
|
85
|
+
adapter.constantize
|
84
86
|
else
|
85
87
|
adapter
|
86
88
|
end
|
@@ -112,9 +114,9 @@ module ActiveAdmin
|
|
112
114
|
redirect_backwards_or_to_root
|
113
115
|
end
|
114
116
|
|
115
|
-
format.csv
|
116
|
-
format.json { render json: { error: error },
|
117
|
-
format.xml
|
117
|
+
format.csv { render body: error, status: :unauthorized }
|
118
|
+
format.json { render json: { error: error }, status: :unauthorized }
|
119
|
+
format.xml { render xml: "<error>#{error}</error>", status: :unauthorized }
|
118
120
|
end
|
119
121
|
end
|
120
122
|
|
@@ -1,12 +1,12 @@
|
|
1
|
-
|
2
|
-
require
|
1
|
+
# frozen_string_literal: true
|
2
|
+
require "active_admin/base_controller/authorization"
|
3
|
+
require "active_admin/base_controller/menu"
|
3
4
|
|
4
5
|
module ActiveAdmin
|
5
6
|
# BaseController for ActiveAdmin.
|
6
7
|
# It implements ActiveAdmin controllers core features.
|
7
8
|
class BaseController < ::InheritedResources::Base
|
8
9
|
helper ::ActiveAdmin::ViewHelpers
|
9
|
-
helper_method :env
|
10
10
|
|
11
11
|
layout :determine_active_admin_layout
|
12
12
|
|
@@ -69,13 +69,14 @@ module ActiveAdmin
|
|
69
69
|
# 2. If we're rendering a custom action, we'll use the active_admin layout so
|
70
70
|
# that users can render any template inside Active Admin.
|
71
71
|
def determine_active_admin_layout
|
72
|
-
ACTIVE_ADMIN_ACTIONS.include?(params[:action].to_sym) ? false :
|
72
|
+
ACTIVE_ADMIN_ACTIONS.include?(params[:action].to_sym) ? false : "active_admin"
|
73
73
|
end
|
74
74
|
|
75
75
|
def active_admin_root
|
76
|
-
controller, action = active_admin_namespace.root_to.split
|
76
|
+
controller, action = active_admin_namespace.root_to.split "#"
|
77
77
|
{ controller: controller, action: action }
|
78
78
|
end
|
79
79
|
|
80
|
+
ActiveSupport.run_load_hooks(:active_admin_controller, self)
|
80
81
|
end
|
81
82
|
end
|