activeadmin 1.3.1 → 2.9.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.
- checksums.yaml +4 -4
- data/CHANGELOG.md +589 -136
- data/CODE_OF_CONDUCT.md +64 -12
- data/CONTRIBUTING.md +83 -61
- data/README.md +73 -19
- data/app/assets/javascripts/active_admin/base.js +517 -0
- data/app/assets/stylesheets/active_admin/_base.scss +29 -29
- data/app/assets/stylesheets/active_admin/_forms.scss +3 -15
- 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 +0 -0
- data/app/assets/stylesheets/active_admin/components/_comments.scss +2 -2
- data/app/assets/stylesheets/active_admin/components/_scopes.scss +3 -0
- data/app/assets/stylesheets/active_admin/components/_status_tags.scss +0 -5
- data/app/assets/stylesheets/active_admin/components/_tables.scss +1 -2
- data/app/assets/stylesheets/active_admin/components/_tabs.scss +1 -1
- data/app/assets/stylesheets/active_admin/mixins/_all.scss +8 -8
- data/app/assets/stylesheets/active_admin/mixins/_gradients.scss +1 -1
- data/app/assets/stylesheets/active_admin/mixins/_variables.scss +8 -0
- data/app/assets/stylesheets/active_admin/print.scss +2 -2
- data/app/assets/stylesheets/active_admin/structure/_main_structure.scss +1 -1
- data/app/javascript/active_admin/base.js +28 -0
- data/app/javascript/active_admin/ext/jquery-ui.js +7 -0
- data/app/javascript/active_admin/ext/jquery.js +9 -0
- data/app/javascript/active_admin/initializers/batch-actions.js +61 -0
- data/app/javascript/active_admin/initializers/checkbox-toggler.js +3 -0
- data/app/javascript/active_admin/initializers/datepicker.js +16 -0
- data/app/javascript/active_admin/initializers/dropdown-menu.js +9 -0
- data/app/javascript/active_admin/initializers/filters.js +10 -0
- data/app/javascript/active_admin/initializers/has-many.js +95 -0
- 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/javascript/active_admin/initializers/tabs.js +6 -0
- data/app/javascript/active_admin/lib/checkbox-toggler.js +49 -0
- data/app/javascript/active_admin/lib/dropdown-menu.js +116 -0
- data/app/javascript/active_admin/lib/filters.js +39 -0
- data/app/javascript/active_admin/lib/modal-dialog.js +63 -0
- data/app/javascript/active_admin/lib/per-page.js +38 -0
- data/app/javascript/active_admin/lib/table-checkbox-toggler.js +38 -0
- data/app/javascript/active_admin/lib/utils.js +40 -0
- data/app/views/active_admin/devise/confirmations/new.html.erb +2 -2
- 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/passwords/edit.html.erb +2 -2
- data/app/views/active_admin/devise/passwords/new.html.erb +2 -2
- data/app/views/active_admin/devise/registrations/new.html.erb +2 -3
- data/app/views/active_admin/devise/sessions/new.html.erb +1 -1
- data/app/views/active_admin/devise/shared/_error_messages.html.erb +15 -0
- data/app/views/active_admin/devise/unlocks/new.html.erb +2 -2
- data/app/views/kaminari/active_admin_countless/_first_page.html.erb +11 -0
- data/app/views/kaminari/active_admin_countless/_gap.html.erb +8 -0
- data/app/views/kaminari/active_admin_countless/_next_page.html.erb +11 -0
- data/app/views/kaminari/active_admin_countless/_page.html.erb +12 -0
- data/app/views/kaminari/active_admin_countless/_paginator.html.erb +24 -0
- data/app/views/kaminari/active_admin_countless/_prev_page.html.erb +11 -0
- data/app/views/layouts/active_admin_logged_out.html.erb +17 -7
- data/config/locales/ar.yml +9 -8
- data/config/locales/az.yml +138 -0
- data/config/locales/bg.yml +1 -1
- data/config/locales/bs.yml +1 -0
- data/config/locales/ca.yml +1 -1
- data/config/locales/cs.yml +1 -0
- data/config/locales/da.yml +1 -0
- data/config/locales/de-CH.yml +1 -0
- data/config/locales/de.yml +29 -0
- data/config/locales/el.yml +1 -0
- data/config/locales/en-CA.yml +4 -3
- data/config/locales/en-GB.yml +4 -3
- data/config/locales/en.yml +23 -4
- data/config/locales/eo.yml +1 -0
- data/config/locales/es-MX.yml +3 -1
- data/config/locales/es.yml +26 -6
- data/config/locales/fa.yml +1 -0
- data/config/locales/fi.yml +2 -1
- data/config/locales/fr.yml +6 -5
- data/config/locales/he.yml +1 -1
- data/config/locales/hr.yml +1 -0
- data/config/locales/hu.yml +5 -0
- data/config/locales/id.yml +1 -0
- data/config/locales/it.yml +23 -0
- data/config/locales/ja.yml +4 -3
- data/config/locales/ko.yml +1 -0
- data/config/locales/lt.yml +3 -2
- data/config/locales/lv.yml +3 -2
- data/config/locales/mk.yml +134 -0
- data/config/locales/nb.yml +16 -5
- data/config/locales/nl.yml +12 -0
- data/config/locales/pl.yml +72 -3
- data/config/locales/pt-BR.yml +1 -0
- data/config/locales/pt-PT.yml +1 -0
- data/config/locales/ro.yml +1 -0
- data/config/locales/ru.yml +3 -0
- data/config/locales/sk.yml +60 -0
- data/config/locales/sv-SE.yml +1 -0
- data/config/locales/tr.yml +10 -0
- data/config/locales/uk.yml +3 -0
- data/config/locales/vi.yml +7 -5
- data/config/locales/zh-CN.yml +34 -5
- data/config/locales/zh-TW.yml +1 -0
- data/docs/.gitignore +1 -0
- data/docs/0-installation.md +28 -4
- data/docs/1-general-configuration.md +36 -1
- data/docs/10-custom-pages.md +14 -0
- data/docs/11-decorators.md +16 -5
- data/docs/12-arbre-components.md +41 -1
- data/docs/13-authorization-adapter.md +41 -22
- data/docs/2-resource-customization.md +19 -5
- data/docs/3-index-pages/custom-index.md +1 -1
- data/docs/3-index-pages/index-as-blog.md +1 -1
- data/docs/3-index-pages/index-as-table.md +12 -5
- data/docs/3-index-pages.md +18 -1
- data/docs/5-forms.md +22 -3
- data/docs/6-show-pages.md +12 -0
- data/docs/8-custom-actions.md +11 -0
- data/docs/9-batch-actions.md +2 -2
- data/docs/CNAME +1 -1
- data/docs/Gemfile +3 -2
- data/docs/Gemfile.lock +259 -0
- data/docs/_config.yml +3 -1
- data/docs/_includes/toc.html +1 -1
- data/docs/_includes/top-menu.html +9 -1
- data/docs/documentation.md +2 -2
- data/docs/images/tidelift.svg +14 -0
- data/docs/index.html +110 -9
- data/docs/stylesheets/main.css +55 -2
- data/lib/active_admin/abstract_view_factory.rb +13 -51
- data/lib/active_admin/application.rb +59 -166
- data/lib/active_admin/application_settings.rb +42 -0
- data/lib/active_admin/asset_registration.rb +0 -8
- data/lib/active_admin/authorization_adapter.rb +3 -3
- data/lib/active_admin/base_controller/authorization.rb +16 -17
- data/lib/active_admin/base_controller.rb +10 -10
- data/lib/active_admin/batch_actions/controller.rb +5 -5
- data/lib/active_admin/batch_actions/resource_extension.rb +15 -10
- data/lib/active_admin/batch_actions/views/batch_action_form.rb +3 -3
- data/lib/active_admin/batch_actions/views/batch_action_selector.rb +6 -6
- data/lib/active_admin/batch_actions/views/selection_cells.rb +3 -3
- data/lib/active_admin/callbacks.rb +1 -1
- data/lib/active_admin/cancan_adapter.rb +1 -1
- data/lib/active_admin/collection_decorator.rb +31 -0
- data/lib/active_admin/controller_action.rb +2 -1
- data/lib/active_admin/csv_builder.rb +14 -9
- data/lib/active_admin/dependency.rb +13 -77
- data/lib/active_admin/deprecation.rb +0 -25
- data/lib/active_admin/devise.rb +5 -5
- data/lib/active_admin/dsl.rb +2 -9
- data/lib/active_admin/dynamic_setting.rb +38 -0
- data/lib/active_admin/dynamic_settings_node.rb +28 -0
- data/lib/active_admin/engine.rb +14 -7
- data/lib/active_admin/error.rb +4 -4
- data/lib/active_admin/filters/active.rb +1 -1
- data/lib/active_admin/filters/active_filter.rb +11 -11
- data/lib/active_admin/filters/active_sidebar.rb +9 -5
- data/lib/active_admin/filters/forms.rb +12 -9
- data/lib/active_admin/filters/formtastic_addons.rb +2 -7
- data/lib/active_admin/filters/resource_extension.rb +29 -5
- data/lib/active_admin/filters.rb +7 -7
- data/lib/active_admin/form_builder.rb +109 -70
- data/lib/active_admin/generators/boilerplate.rb +12 -4
- data/lib/active_admin/helpers/optional_display.rb +2 -2
- data/lib/active_admin/helpers/scope_chain.rb +1 -0
- data/lib/active_admin/inputs/datepicker_input.rb +9 -2
- data/lib/active_admin/inputs/filters/base/search_method_select.rb +6 -6
- data/lib/active_admin/inputs/filters/base.rb +1 -1
- data/lib/active_admin/inputs/filters/boolean_input.rb +1 -1
- data/lib/active_admin/inputs/filters/check_boxes_input.rb +1 -1
- data/lib/active_admin/inputs/filters/date_range_input.rb +15 -12
- data/lib/active_admin/inputs/filters/select_input.rb +2 -2
- data/lib/active_admin/localizers/resource_localizer.rb +3 -3
- data/lib/active_admin/localizers.rb +1 -1
- data/lib/active_admin/menu.rb +8 -11
- data/lib/active_admin/menu_item.rb +10 -38
- data/lib/active_admin/namespace.rb +30 -18
- data/lib/active_admin/namespace_settings.rb +126 -0
- data/lib/active_admin/order_clause.rb +2 -2
- data/lib/active_admin/orm/active_record/comments/comment.rb +4 -4
- data/lib/active_admin/orm/active_record/comments/views/active_admin_comments.rb +29 -24
- data/lib/active_admin/orm/active_record/comments/views.rb +2 -2
- data/lib/active_admin/orm/active_record/comments.rb +34 -23
- data/lib/active_admin/orm/active_record.rb +1 -1
- data/lib/active_admin/page.rb +1 -1
- data/lib/active_admin/page_dsl.rb +1 -1
- data/lib/active_admin/page_presenter.rb +2 -1
- data/lib/active_admin/pundit_adapter.rb +22 -9
- data/lib/active_admin/resource/action_items.rb +11 -6
- data/lib/active_admin/resource/attributes.rb +8 -5
- data/lib/active_admin/resource/belongs_to.rb +8 -3
- data/lib/active_admin/resource/controllers.rb +1 -1
- data/lib/active_admin/resource/menu.rb +5 -5
- data/lib/active_admin/resource/model.rb +15 -0
- data/lib/active_admin/resource/naming.rb +5 -5
- data/lib/active_admin/resource/routes.rb +25 -14
- data/lib/active_admin/resource/scope_to.rb +7 -7
- data/lib/active_admin/resource/scopes.rb +3 -3
- data/lib/active_admin/resource/sidebars.rb +2 -2
- data/lib/active_admin/resource.rb +34 -20
- data/lib/active_admin/resource_collection.rb +2 -2
- data/lib/active_admin/resource_controller/action_builder.rb +10 -0
- data/lib/active_admin/resource_controller/data_access.rb +1 -1
- data/lib/active_admin/resource_controller/decorators.rb +9 -31
- data/lib/active_admin/resource_controller/polymorphic_routes.rb +37 -0
- data/lib/active_admin/resource_controller/resource_class_methods.rb +2 -0
- data/lib/active_admin/resource_controller/scoping.rb +1 -1
- data/lib/active_admin/resource_controller/streaming.rb +7 -6
- data/lib/active_admin/resource_controller.rb +13 -10
- data/lib/active_admin/resource_dsl.rb +11 -9
- data/lib/active_admin/router.rb +90 -84
- data/lib/active_admin/scope.rb +19 -11
- data/lib/active_admin/settings_node.rb +19 -0
- data/lib/active_admin/sidebar_section.rb +3 -1
- data/lib/active_admin/version.rb +1 -1
- data/lib/active_admin/view_factory.rb +17 -17
- data/lib/active_admin/view_helpers/breadcrumb_helper.rb +5 -5
- data/lib/active_admin/view_helpers/display_helper.rb +16 -7
- data/lib/active_admin/view_helpers/download_format_links_helper.rb +2 -1
- data/lib/active_admin/view_helpers/fields_for.rb +2 -2
- data/lib/active_admin/view_helpers/method_or_proc_helper.rb +3 -0
- data/lib/active_admin/view_helpers.rb +1 -1
- data/lib/active_admin/views/components/active_admin_form.rb +12 -7
- data/lib/active_admin/views/components/attributes_table.rb +8 -8
- data/lib/active_admin/views/components/blank_slate.rb +1 -1
- data/lib/active_admin/views/components/dropdown_menu.rb +8 -8
- data/lib/active_admin/views/components/index_list.rb +3 -3
- data/lib/active_admin/views/components/menu.rb +32 -0
- data/lib/active_admin/views/components/menu_item.rb +58 -0
- data/lib/active_admin/views/components/paginated_collection.rb +21 -20
- data/lib/active_admin/views/components/panel.rb +1 -1
- data/lib/active_admin/views/components/scopes.rb +17 -8
- data/lib/active_admin/views/components/sidebar.rb +13 -0
- data/lib/active_admin/views/components/sidebar_section.rb +0 -3
- data/lib/active_admin/views/components/site_title.rb +6 -7
- data/lib/active_admin/views/components/status_tag.rb +13 -26
- data/lib/active_admin/views/components/table_for.rb +21 -29
- data/lib/active_admin/views/components/tabs.rb +17 -5
- data/lib/active_admin/views/footer.rb +5 -8
- data/lib/active_admin/views/header.rb +3 -15
- data/lib/active_admin/views/index_as_blog.rb +2 -2
- data/lib/active_admin/views/index_as_grid.rb +26 -26
- data/lib/active_admin/views/index_as_table.rb +33 -25
- data/lib/active_admin/views/pages/base.rb +40 -59
- data/lib/active_admin/views/pages/index.rb +15 -13
- data/lib/active_admin/views/tabbed_navigation.rb +4 -59
- data/lib/active_admin/views/title_bar.rb +1 -1
- data/lib/active_admin/views.rb +1 -1
- data/lib/active_admin.rb +67 -63
- data/lib/activeadmin.rb +1 -1
- data/lib/generators/active_admin/assets/assets_generator.rb +2 -2
- data/lib/generators/active_admin/assets/templates/active_admin.js +1 -0
- data/lib/generators/active_admin/assets/templates/active_admin.scss +2 -2
- data/lib/generators/active_admin/devise/devise_generator.rb +5 -5
- data/lib/generators/active_admin/install/install_generator.rb +18 -8
- data/lib/generators/active_admin/install/templates/active_admin.rb.erb +45 -3
- data/lib/generators/active_admin/install/templates/dashboard.rb +2 -3
- data/lib/generators/active_admin/install/templates/migrations/create_active_admin_comments.rb.erb +1 -15
- data/lib/generators/active_admin/page/page_generator.rb +1 -1
- data/lib/generators/active_admin/resource/resource_generator.rb +3 -3
- data/lib/generators/active_admin/resource/templates/admin.rb.erb +40 -37
- 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 +26 -0
- data/lib/ransack_ext.rb +9 -9
- data/vendor/assets/javascripts/jquery-ui/form-reset-mixin.js +80 -0
- data/vendor/assets/javascripts/jquery-ui/form.js +22 -0
- data/vendor/assets/javascripts/jquery-ui/labels.js +65 -0
- data/vendor/assets/javascripts/jquery-ui/widgets/checkboxradio.js +274 -283
- metadata +120 -553
- data/.github/ISSUE_TEMPLATE.md +0 -20
- data/.gitignore +0 -49
- data/.mdlrc +0 -1
- data/.rubocop.yml +0 -76
- data/.simplecov +0 -13
- data/.travis.yml +0 -51
- data/.yardopts +0 -7
- data/Gemfile +0 -58
- data/Rakefile +0 -54
- data/activeadmin.gemspec +0 -32
- 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.js.coffee +0 -13
- data/app/assets/javascripts/active_admin/ext/jquery-ui.js.coffee +0 -6
- data/app/assets/javascripts/active_admin/ext/jquery.js.coffee +0 -7
- data/app/assets/javascripts/active_admin/initializers/batch_actions.js.coffee +0 -11
- data/app/assets/javascripts/active_admin/initializers/datepicker.js.coffee +0 -14
- data/app/assets/javascripts/active_admin/initializers/filters.js.coffee +0 -26
- data/app/assets/javascripts/active_admin/initializers/tabs.js.coffee +0 -7
- data/app/assets/javascripts/active_admin/lib/batch_actions.js.coffee +0 -42
- data/app/assets/javascripts/active_admin/lib/checkbox-toggler.js.coffee +0 -46
- data/app/assets/javascripts/active_admin/lib/dropdown-menu.js.coffee +0 -104
- data/app/assets/javascripts/active_admin/lib/flash.js.coffee +0 -19
- data/app/assets/javascripts/active_admin/lib/has_many.js.coffee +0 -79
- data/app/assets/javascripts/active_admin/lib/modal_dialog.js.coffee +0 -45
- data/app/assets/javascripts/active_admin/lib/per_page.js.coffee +0 -46
- data/app/assets/javascripts/active_admin/lib/table-checkbox-toggler.js.coffee +0 -22
- data/codecov.yml +0 -25
- data/config/i18n-tasks.yml +0 -26
- data/config/mdl_style.rb +0 -9
- data/cucumber.yml +0 -3
- data/features/action_item.feature +0 -73
- data/features/authorization.feature +0 -64
- data/features/authorization_cancan.feature +0 -52
- data/features/authorization_pundit.feature +0 -37
- data/features/belongs_to.feature +0 -124
- data/features/breadcrumb.feature +0 -75
- data/features/comments/commenting.feature +0 -178
- data/features/comments/viewing_index.feature +0 -19
- data/features/create_another.feature +0 -55
- data/features/dashboard.feature +0 -16
- data/features/decorators.feature +0 -43
- data/features/development_reloading.feature +0 -28
- data/features/edit_page.feature +0 -116
- data/features/favicon.feature +0 -20
- data/features/first_boot.feature +0 -16
- data/features/footer.feature +0 -28
- data/features/global_navigation.feature +0 -29
- data/features/i18n.feature +0 -55
- data/features/index/batch_actions.feature +0 -218
- data/features/index/filters.feature +0 -250
- data/features/index/format_as_csv.feature +0 -220
- data/features/index/formats.feature +0 -88
- data/features/index/index_as_block.feature +0 -15
- data/features/index/index_as_blog.feature +0 -69
- data/features/index/index_as_grid.feature +0 -45
- data/features/index/index_as_table.feature +0 -291
- data/features/index/index_blank_slate.feature +0 -83
- data/features/index/index_parameters.feature +0 -75
- data/features/index/index_scope_to.feature +0 -56
- data/features/index/index_scopes.feature +0 -285
- data/features/index/page_title.feature +0 -41
- data/features/index/pagination.feature +0 -63
- data/features/index/switch_index_view.feature +0 -73
- data/features/menu.feature +0 -72
- data/features/meta_tags.feature +0 -21
- data/features/new_page.feature +0 -136
- data/features/registering_assets.feature +0 -38
- data/features/registering_pages.feature +0 -237
- data/features/registering_resources.feature +0 -33
- data/features/renamed_resource.feature +0 -30
- data/features/root_to.feature +0 -17
- data/features/show/attributes_table_title.feature +0 -54
- data/features/show/columns.feature +0 -40
- data/features/show/default_content.feature +0 -44
- data/features/show/page_title.feature +0 -58
- data/features/show/tabs.feature +0 -33
- data/features/sidebar_sections.feature +0 -210
- data/features/site_title.feature +0 -47
- data/features/specifying_actions.feature +0 -118
- data/features/step_definitions/action_item_steps.rb +0 -7
- data/features/step_definitions/action_link_steps.rb +0 -19
- data/features/step_definitions/additional_web_steps.rb +0 -81
- data/features/step_definitions/asset_steps.rb +0 -15
- data/features/step_definitions/attribute_steps.rb +0 -18
- data/features/step_definitions/attributes_table_title_steps.rb +0 -11
- data/features/step_definitions/batch_action_steps.rb +0 -81
- data/features/step_definitions/blog_steps.rb +0 -3
- data/features/step_definitions/breadcrumb_steps.rb +0 -3
- data/features/step_definitions/column_steps.rb +0 -8
- data/features/step_definitions/comment_steps.rb +0 -32
- data/features/step_definitions/configuration_steps.rb +0 -100
- data/features/step_definitions/dashboard_steps.rb +0 -15
- data/features/step_definitions/factory_steps.rb +0 -35
- data/features/step_definitions/filter_steps.rb +0 -47
- data/features/step_definitions/flash_steps.rb +0 -11
- data/features/step_definitions/footer_steps.rb +0 -11
- data/features/step_definitions/format_steps.rb +0 -56
- data/features/step_definitions/i18n_steps.rb +0 -11
- data/features/step_definitions/index_scope_steps.rb +0 -29
- data/features/step_definitions/index_views_steps.rb +0 -3
- data/features/step_definitions/layout_steps.rb +0 -3
- data/features/step_definitions/member_link_steps.rb +0 -7
- data/features/step_definitions/menu_steps.rb +0 -11
- data/features/step_definitions/meta_tag_steps.rb +0 -3
- data/features/step_definitions/pagination_steps.rb +0 -15
- data/features/step_definitions/sidebar_steps.rb +0 -11
- data/features/step_definitions/site_title_steps.rb +0 -17
- data/features/step_definitions/tab_steps.rb +0 -8
- data/features/step_definitions/table_steps.rb +0 -116
- data/features/step_definitions/user_steps.rb +0 -52
- data/features/step_definitions/web_steps.rb +0 -86
- data/features/sti_resource.feature +0 -65
- data/features/strong_parameters.feature +0 -69
- data/features/support/env.rb +0 -122
- data/features/support/paths.rb +0 -73
- data/features/support/regular_env.rb +0 -7
- data/features/support/reload_env.rb +0 -7
- data/features/support/selectors.rb +0 -45
- data/features/users/logging_in.feature +0 -36
- data/features/users/logging_out.feature +0 -13
- data/features/users/resetting_password.feature +0 -34
- data/gemfiles/rails_42.gemfile +0 -10
- data/gemfiles/rails_50.gemfile +0 -10
- data/gemfiles/rails_51.gemfile +0 -10
- data/gemfiles/rails_52.gemfile +0 -11
- data/lib/active_admin/event.rb +0 -24
- data/lib/active_admin/helpers/output_safety_helper.rb +0 -35
- data/lib/active_admin/helpers/settings.rb +0 -114
- data/lib/active_admin/reloader.rb +0 -25
- data/lib/bug_report_templates/active_admin_master.rb +0 -112
- data/lib/generators/active_admin/assets/templates/active_admin.js.coffee +0 -1
- data/spec/bug_report_templates_spec.rb +0 -26
- data/spec/javascripts/coffeescripts/jquery.aa.checkbox-toggler-spec.js.coffee +0 -50
- data/spec/javascripts/coffeescripts/jquery.aa.flash.js.coffee +0 -25
- data/spec/javascripts/coffeescripts/jquery.aa.table-checkbox-toggler-spec.js.coffee +0 -34
- data/spec/javascripts/fixtures/checkboxes.html +0 -9
- data/spec/javascripts/fixtures/flashes.html +0 -2
- data/spec/javascripts/fixtures/table_checkboxes.html +0 -17
- data/spec/javascripts/helpers/SpecHelper.js +0 -3
- data/spec/javascripts/support/jasmine.yml +0 -74
- data/spec/javascripts/support/jasmine_runner.rb +0 -19
- data/spec/rails_helper.rb +0 -59
- data/spec/requests/default_namespace_spec.rb +0 -81
- data/spec/requests/memory_spec.rb +0 -25
- data/spec/requests/stylesheets_spec.rb +0 -18
- data/spec/spec_helper.rb +0 -1
- data/spec/support/active_admin_integration_spec_helper.rb +0 -73
- data/spec/support/active_admin_request_helpers.rb +0 -39
- data/spec/support/rails_template.rb +0 -153
- data/spec/support/rails_template_with_data.rb +0 -327
- data/spec/support/templates/admin/stores.rb +0 -7
- data/spec/support/templates/en.yml +0 -8
- data/spec/support/templates/manifest.js +0 -3
- data/spec/support/templates/policies/active_admin/comment_policy.rb +0 -9
- data/spec/support/templates/policies/active_admin/page_policy.rb +0 -18
- data/spec/support/templates/policies/admin_user_policy.rb +0 -11
- data/spec/support/templates/policies/application_policy.rb +0 -44
- data/spec/support/templates/policies/category_policy.rb +0 -7
- data/spec/support/templates/policies/post_policy.rb +0 -15
- data/spec/support/templates/policies/store_policy.rb +0 -11
- data/spec/support/templates/policies/user_policy.rb +0 -11
- data/spec/support/templates/post_decorator.rb +0 -24
- data/spec/unit/abstract_view_factory_spec.rb +0 -78
- data/spec/unit/action_builder_spec.rb +0 -158
- data/spec/unit/active_admin_spec.rb +0 -11
- data/spec/unit/application_spec.rb +0 -184
- data/spec/unit/asset_registration_spec.rb +0 -81
- data/spec/unit/authorization/authorization_adapter_spec.rb +0 -61
- data/spec/unit/authorization/controller_authorization_spec.rb +0 -43
- data/spec/unit/authorization/index_overriding_spec.rb +0 -23
- data/spec/unit/auto_link_spec.rb +0 -93
- data/spec/unit/batch_actions/resource_spec.rb +0 -84
- data/spec/unit/batch_actions/settings_spec.rb +0 -61
- data/spec/unit/belongs_to_spec.rb +0 -76
- data/spec/unit/cancan_adapter_spec.rb +0 -43
- data/spec/unit/comments_spec.rb +0 -176
- data/spec/unit/component_spec.rb +0 -18
- data/spec/unit/config_shared_examples.rb +0 -59
- data/spec/unit/controller_filters_spec.rb +0 -41
- data/spec/unit/csv_builder_spec.rb +0 -313
- data/spec/unit/dependency_spec.rb +0 -135
- data/spec/unit/devise_spec.rb +0 -110
- data/spec/unit/dsl_spec.rb +0 -120
- data/spec/unit/filters/active_filter_spec.rb +0 -189
- data/spec/unit/filters/active_spec.rb +0 -24
- data/spec/unit/filters/filter_form_builder_spec.rb +0 -524
- data/spec/unit/filters/resource_spec.rb +0 -128
- data/spec/unit/form_builder_spec.rb +0 -990
- data/spec/unit/generators/install_spec.rb +0 -31
- data/spec/unit/helpers/collection_spec.rb +0 -68
- data/spec/unit/helpers/output_safety_helper_spec.rb +0 -79
- data/spec/unit/helpers/scope_chain_spec.rb +0 -35
- data/spec/unit/helpers/settings_spec.rb +0 -30
- data/spec/unit/i18n_spec.rb +0 -29
- data/spec/unit/localizers/resource_localizer_spec.rb +0 -36
- data/spec/unit/menu_collection_spec.rb +0 -62
- data/spec/unit/menu_item_spec.rb +0 -141
- data/spec/unit/menu_spec.rb +0 -71
- data/spec/unit/namespace/authorization_spec.rb +0 -27
- data/spec/unit/namespace/register_page_spec.rb +0 -99
- data/spec/unit/namespace/register_resource_spec.rb +0 -162
- data/spec/unit/namespace_spec.rb +0 -124
- data/spec/unit/order_clause_spec.rb +0 -81
- data/spec/unit/page_controller_spec.rb +0 -5
- data/spec/unit/page_spec.rb +0 -128
- data/spec/unit/pretty_format_spec.rb +0 -82
- data/spec/unit/pundit_adapter_spec.rb +0 -98
- data/spec/unit/resource/action_items_spec.rb +0 -69
- data/spec/unit/resource/attributes_spec.rb +0 -49
- data/spec/unit/resource/includes_spec.rb +0 -21
- data/spec/unit/resource/menu_spec.rb +0 -18
- data/spec/unit/resource/naming_spec.rb +0 -122
- data/spec/unit/resource/ordering_spec.rb +0 -35
- data/spec/unit/resource/page_presenters_spec.rb +0 -44
- data/spec/unit/resource/pagination_spec.rb +0 -38
- data/spec/unit/resource/routes_spec.rb +0 -125
- data/spec/unit/resource/scopes_spec.rb +0 -50
- data/spec/unit/resource/sidebars_spec.rb +0 -43
- data/spec/unit/resource_collection_spec.rb +0 -175
- data/spec/unit/resource_controller/data_access_spec.rb +0 -234
- data/spec/unit/resource_controller/decorators_spec.rb +0 -94
- data/spec/unit/resource_controller/sidebars_spec.rb +0 -37
- data/spec/unit/resource_controller_spec.rb +0 -273
- data/spec/unit/resource_registration_spec.rb +0 -61
- data/spec/unit/resource_spec.rb +0 -320
- data/spec/unit/routing_spec.rb +0 -211
- data/spec/unit/scope_spec.rb +0 -209
- data/spec/unit/settings_spec.rb +0 -117
- data/spec/unit/view_factory_spec.rb +0 -19
- data/spec/unit/view_helpers/breadcrumbs_spec.rb +0 -253
- data/spec/unit/view_helpers/display_helper_spec.rb +0 -203
- data/spec/unit/view_helpers/download_format_links_helper_spec.rb +0 -39
- data/spec/unit/view_helpers/fields_for_spec.rb +0 -50
- data/spec/unit/view_helpers/flash_helper_spec.rb +0 -24
- data/spec/unit/view_helpers/form_helper_spec.rb +0 -42
- data/spec/unit/view_helpers/method_or_proc_helper_spec.rb +0 -138
- data/spec/unit/views/components/attributes_table_spec.rb +0 -271
- data/spec/unit/views/components/batch_action_selector_spec.rb +0 -43
- data/spec/unit/views/components/blank_slate_spec.rb +0 -27
- data/spec/unit/views/components/columns_spec.rb +0 -187
- data/spec/unit/views/components/index_list_spec.rb +0 -49
- data/spec/unit/views/components/index_table_for_spec.rb +0 -127
- data/spec/unit/views/components/paginated_collection_spec.rb +0 -249
- data/spec/unit/views/components/panel_spec.rb +0 -58
- data/spec/unit/views/components/sidebar_section_spec.rb +0 -68
- data/spec/unit/views/components/site_title_spec.rb +0 -76
- data/spec/unit/views/components/status_tag_spec.rb +0 -265
- data/spec/unit/views/components/table_for_spec.rb +0 -436
- data/spec/unit/views/components/tabs_spec.rb +0 -67
- data/spec/unit/views/components/unsupported_browser_spec.rb +0 -41
- data/spec/unit/views/index_as_blog_spec.rb +0 -76
- data/spec/unit/views/pages/form_spec.rb +0 -54
- data/spec/unit/views/pages/index_spec.rb +0 -60
- data/spec/unit/views/pages/layout_spec.rb +0 -59
- data/spec/unit/views/pages/show_spec.rb +0 -32
- data/spec/unit/views/tabbed_navigation_spec.rb +0 -158
- data/tasks/docs.rake +0 -64
- data/tasks/lint.rake +0 -21
- data/tasks/local.rake +0 -25
- data/tasks/parallel_tests.rake +0 -66
- data/tasks/test.rake +0 -29
|
@@ -26,9 +26,10 @@ module ActiveAdmin
|
|
|
26
26
|
end
|
|
27
27
|
|
|
28
28
|
def label
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
29
|
+
translated_predicate = predicate_name.downcase
|
|
30
|
+
if filter_label && filter_label.is_a?(Proc)
|
|
31
|
+
"#{filter_label.call} #{translated_predicate}"
|
|
32
|
+
elsif filter_label
|
|
32
33
|
"#{filter_label} #{translated_predicate}"
|
|
33
34
|
elsif related_class
|
|
34
35
|
"#{related_class_name} #{translated_predicate}"
|
|
@@ -38,8 +39,9 @@ module ActiveAdmin
|
|
|
38
39
|
end
|
|
39
40
|
|
|
40
41
|
def predicate_name
|
|
41
|
-
I18n.t(
|
|
42
|
-
|
|
42
|
+
I18n.t(
|
|
43
|
+
"active_admin.filters.predicates.#{condition.predicate.name}",
|
|
44
|
+
default: ransack_predicate_name)
|
|
43
45
|
end
|
|
44
46
|
|
|
45
47
|
def html_options
|
|
@@ -65,7 +67,7 @@ module ActiveAdmin
|
|
|
65
67
|
def filter_label
|
|
66
68
|
return unless filter
|
|
67
69
|
|
|
68
|
-
filter[:label]
|
|
70
|
+
filter[:label] || I18n.t(name, scope: ["formtastic", "labels"], default: nil)
|
|
69
71
|
end
|
|
70
72
|
|
|
71
73
|
#@return Ransack::Nodes::Attribute
|
|
@@ -82,7 +84,7 @@ module ActiveAdmin
|
|
|
82
84
|
end
|
|
83
85
|
|
|
84
86
|
def find_class?
|
|
85
|
-
[
|
|
87
|
+
["eq", "in"].include? condition.predicate.arel_predicate
|
|
86
88
|
end
|
|
87
89
|
|
|
88
90
|
# detect related class for Ransack::Nodes::Attribute
|
|
@@ -95,12 +97,12 @@ module ActiveAdmin
|
|
|
95
97
|
end
|
|
96
98
|
|
|
97
99
|
def filter
|
|
98
|
-
resource.filters[name.to_sym]
|
|
100
|
+
resource.filters[name.to_sym] || resource.filters[condition.key.to_sym]
|
|
99
101
|
end
|
|
100
102
|
|
|
101
103
|
def related_primary_key
|
|
102
104
|
if predicate_association
|
|
103
|
-
predicate_association.
|
|
105
|
+
predicate_association.association_primary_key
|
|
104
106
|
elsif related_class
|
|
105
107
|
related_class.primary_key
|
|
106
108
|
end
|
|
@@ -111,8 +113,6 @@ module ActiveAdmin
|
|
|
111
113
|
@predicate_association
|
|
112
114
|
end
|
|
113
115
|
|
|
114
|
-
private
|
|
115
|
-
|
|
116
116
|
def find_predicate_association
|
|
117
117
|
condition_attribute.klass.reflect_on_all_associations.
|
|
118
118
|
reject { |r| r.options[:polymorphic] }. #skip polymorphic
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
require
|
|
1
|
+
require "active_admin/filters/active"
|
|
2
2
|
|
|
3
3
|
module ActiveAdmin
|
|
4
4
|
module Filters
|
|
5
5
|
class ActiveSidebar < ActiveAdmin::SidebarSection
|
|
6
6
|
|
|
7
7
|
def initialize
|
|
8
|
-
super
|
|
8
|
+
super "search_status", sidebar_options
|
|
9
9
|
end
|
|
10
10
|
|
|
11
11
|
def block
|
|
@@ -13,11 +13,11 @@ module ActiveAdmin
|
|
|
13
13
|
active_filters = ActiveAdmin::Filters::Active.new(active_admin_config, assigns[:search])
|
|
14
14
|
span do
|
|
15
15
|
if current_scope
|
|
16
|
-
h4 I18n.t("active_admin.search_status.current_scope"), style:
|
|
17
|
-
b scope_name(current_scope), class:
|
|
16
|
+
h4 I18n.t("active_admin.search_status.current_scope"), style: "display: inline"
|
|
17
|
+
b scope_name(current_scope), class: "current_scope_name", style: "display: inline"
|
|
18
18
|
end
|
|
19
19
|
div style: "margin-top: 10px" do
|
|
20
|
-
h4 I18n.t("active_admin.search_status.current_filters"), style:
|
|
20
|
+
h4 I18n.t("active_admin.search_status.current_filters"), style: "margin-bottom: 10px"
|
|
21
21
|
ul do
|
|
22
22
|
if active_filters.filters.blank?
|
|
23
23
|
li I18n.t("active_admin.search_status.no_current_filters")
|
|
@@ -39,6 +39,10 @@ module ActiveAdmin
|
|
|
39
39
|
end
|
|
40
40
|
end
|
|
41
41
|
|
|
42
|
+
def title
|
|
43
|
+
I18n.t("active_admin.search_status.headline")
|
|
44
|
+
end
|
|
45
|
+
|
|
42
46
|
protected
|
|
43
47
|
|
|
44
48
|
def sidebar_options
|
|
@@ -48,22 +48,25 @@ module ActiveAdmin
|
|
|
48
48
|
def active_admin_filters_form_for(search, filters, options = {})
|
|
49
49
|
defaults = { builder: ActiveAdmin::Filters::FormBuilder,
|
|
50
50
|
url: collection_path,
|
|
51
|
-
html: {class:
|
|
52
|
-
required = { html: {method: :get},
|
|
51
|
+
html: { class: "filter_form" } }
|
|
52
|
+
required = { html: { method: :get },
|
|
53
53
|
as: :q }
|
|
54
|
-
options
|
|
54
|
+
options = defaults.deep_merge(options).deep_merge(required)
|
|
55
55
|
|
|
56
56
|
form_for search, options do |f|
|
|
57
57
|
filters.each do |attribute, opts|
|
|
58
|
-
next if opts.key?(:if)
|
|
59
|
-
next if opts.key?(:unless) &&
|
|
60
|
-
|
|
61
|
-
|
|
58
|
+
next if opts.key?(:if) && !call_method_or_proc_on(self, opts[:if])
|
|
59
|
+
next if opts.key?(:unless) && call_method_or_proc_on(self, opts[:unless])
|
|
60
|
+
|
|
61
|
+
filter_opts = opts.except(:if, :unless)
|
|
62
|
+
filter_opts[:input_html] = instance_exec(&filter_opts[:input_html]) if filter_opts[:input_html].is_a?(Proc)
|
|
63
|
+
|
|
64
|
+
f.filter attribute, filter_opts
|
|
62
65
|
end
|
|
63
66
|
|
|
64
67
|
buttons = content_tag :div, class: "buttons" do
|
|
65
|
-
f.submit(I18n.t(
|
|
66
|
-
link_to(I18n.t(
|
|
68
|
+
f.submit(I18n.t("active_admin.filters.buttons.filter")) +
|
|
69
|
+
link_to(I18n.t("active_admin.filters.buttons.clear"), "#", class: "clear_filters_btn") +
|
|
67
70
|
hidden_field_tags_for(params, except: except_hidden_fields)
|
|
68
71
|
end
|
|
69
72
|
|
|
@@ -37,7 +37,7 @@ module ActiveAdmin
|
|
|
37
37
|
end
|
|
38
38
|
|
|
39
39
|
def polymorphic_foreign_type?(method)
|
|
40
|
-
klass.reflect_on_all_associations.select{ |r| r.macro == :belongs_to && r.options[:polymorphic] }
|
|
40
|
+
klass.reflect_on_all_associations.select { |r| r.macro == :belongs_to && r.options[:polymorphic] }
|
|
41
41
|
.map(&:foreign_type).include? method.to_s
|
|
42
42
|
end
|
|
43
43
|
|
|
@@ -54,7 +54,7 @@ module ActiveAdmin
|
|
|
54
54
|
end
|
|
55
55
|
|
|
56
56
|
def seems_searchable?
|
|
57
|
-
has_predicate? || scope?
|
|
57
|
+
column_for(method).nil? && (has_predicate? || scope?)
|
|
58
58
|
end
|
|
59
59
|
|
|
60
60
|
# If the given method has a predicate (like _eq or _lteq), it's pretty
|
|
@@ -63,11 +63,6 @@ module ActiveAdmin
|
|
|
63
63
|
!!Ransack::Predicate.detect_from_string(method.to_s)
|
|
64
64
|
end
|
|
65
65
|
|
|
66
|
-
# Ransack lets you define custom search methods, called ransackers.
|
|
67
|
-
def ransacker?
|
|
68
|
-
klass._ransackers.key? method.to_s
|
|
69
|
-
end
|
|
70
|
-
|
|
71
66
|
# Ransack supports exposing selected scopes on your model for advanced searches.
|
|
72
67
|
def scope?
|
|
73
68
|
context = Ransack::Context.for klass
|
|
@@ -83,7 +83,7 @@ module ActiveAdmin
|
|
|
83
83
|
@filters_to_remove = nil
|
|
84
84
|
end
|
|
85
85
|
|
|
86
|
-
|
|
86
|
+
private
|
|
87
87
|
|
|
88
88
|
# Collapses the waveform, if you will, of which filters should be displayed.
|
|
89
89
|
# Removes filters and adds in default filters as desired.
|
|
@@ -123,25 +123,49 @@ module ActiveAdmin
|
|
|
123
123
|
# Returns a default set of filters for the associations
|
|
124
124
|
def default_association_filters
|
|
125
125
|
if resource_class.respond_to?(:reflect_on_all_associations)
|
|
126
|
-
poly, not_poly = resource_class.reflect_on_all_associations.partition{ |r| r.macro == :belongs_to && r.options[:polymorphic] }
|
|
126
|
+
poly, not_poly = resource_class.reflect_on_all_associations.partition { |r| r.macro == :belongs_to && r.options[:polymorphic] }
|
|
127
127
|
|
|
128
128
|
# remove deeply nested associations
|
|
129
|
-
not_poly.reject!{ |r| r.chain.length > 2 }
|
|
129
|
+
not_poly.reject! { |r| r.chain.length > 2 }
|
|
130
130
|
|
|
131
131
|
filters = poly.map(&:foreign_type) + not_poly.map(&:name)
|
|
132
|
+
|
|
133
|
+
# Check high-arity associations for filterable columns
|
|
134
|
+
max = namespace.maximum_association_filter_arity
|
|
135
|
+
if max != :unlimited
|
|
136
|
+
high_arity, low_arity = not_poly.partition do |r|
|
|
137
|
+
r.klass.reorder(nil).limit(max + 1).count > max
|
|
138
|
+
end
|
|
139
|
+
|
|
140
|
+
# Remove high-arity associations with no searchable column
|
|
141
|
+
high_arity = high_arity.select(&method(:searchable_column_for))
|
|
142
|
+
|
|
143
|
+
high_arity = high_arity.map { |r| r.name.to_s + "_" + searchable_column_for(r) + namespace.filter_method_for_large_association }
|
|
144
|
+
|
|
145
|
+
filters = poly.map(&:foreign_type) + low_arity.map(&:name) + high_arity
|
|
146
|
+
end
|
|
147
|
+
|
|
132
148
|
filters.map &:to_sym
|
|
133
149
|
else
|
|
134
150
|
[]
|
|
135
151
|
end
|
|
136
152
|
end
|
|
137
153
|
|
|
154
|
+
def search_columns
|
|
155
|
+
@search_columns ||= namespace.filter_columns_for_large_association.map(&:to_s)
|
|
156
|
+
end
|
|
157
|
+
|
|
158
|
+
def searchable_column_for(relation)
|
|
159
|
+
relation.klass.column_names.find { |name| search_columns.include?(name) }
|
|
160
|
+
end
|
|
161
|
+
|
|
138
162
|
def add_filters_sidebar_section
|
|
139
163
|
self.sidebar_sections << filters_sidebar_section
|
|
140
164
|
end
|
|
141
165
|
|
|
142
166
|
def filters_sidebar_section
|
|
143
|
-
ActiveAdmin::SidebarSection.new :filters, only: :index, if: ->{ active_admin_config.filters.any? } do
|
|
144
|
-
active_admin_filters_form_for assigns[:search], active_admin_config.filters
|
|
167
|
+
ActiveAdmin::SidebarSection.new :filters, only: :index, if: -> { active_admin_config.filters.any? } do
|
|
168
|
+
active_admin_filters_form_for assigns[:search], **active_admin_config.filters
|
|
145
169
|
end
|
|
146
170
|
end
|
|
147
171
|
|
data/lib/active_admin/filters.rb
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
require
|
|
2
|
-
require
|
|
3
|
-
require
|
|
4
|
-
require
|
|
5
|
-
require
|
|
6
|
-
require
|
|
1
|
+
require "active_admin/filters/dsl"
|
|
2
|
+
require "active_admin/filters/resource_extension"
|
|
3
|
+
require "active_admin/filters/formtastic_addons"
|
|
4
|
+
require "active_admin/filters/forms"
|
|
5
|
+
require "active_admin/helpers/optional_display"
|
|
6
|
+
require "active_admin/filters/active_sidebar"
|
|
7
7
|
|
|
8
8
|
# Add our Extensions
|
|
9
9
|
ActiveAdmin::ResourceDSL.send :include, ActiveAdmin::Filters::DSL
|
|
10
|
-
ActiveAdmin::Resource.send
|
|
10
|
+
ActiveAdmin::Resource.send :include, ActiveAdmin::Filters::ResourceExtension
|
|
11
11
|
ActiveAdmin::ViewHelpers.send :include, ActiveAdmin::Filters::ViewHelper
|
|
@@ -13,7 +13,6 @@ end
|
|
|
13
13
|
|
|
14
14
|
module ActiveAdmin
|
|
15
15
|
class FormBuilder < ::Formtastic::FormBuilder
|
|
16
|
-
include MethodOrProcHelper
|
|
17
16
|
|
|
18
17
|
self.input_namespaces = [::Object, ::ActiveAdmin::Inputs, ::Formtastic::Inputs]
|
|
19
18
|
|
|
@@ -21,127 +20,167 @@ module ActiveAdmin
|
|
|
21
20
|
self.input_class_finder = ::Formtastic::InputClassFinder
|
|
22
21
|
self.action_class_finder = ::Formtastic::ActionClassFinder
|
|
23
22
|
|
|
24
|
-
def cancel_link(url = {action: "index"}, html_options = {}, li_attrs = {})
|
|
23
|
+
def cancel_link(url = { action: "index" }, html_options = {}, li_attrs = {})
|
|
25
24
|
li_attrs[:class] ||= "cancel"
|
|
26
|
-
li_content = template.link_to I18n.t(
|
|
25
|
+
li_content = template.link_to I18n.t("active_admin.cancel"), url, html_options
|
|
27
26
|
template.content_tag(:li, li_content, li_attrs)
|
|
28
27
|
end
|
|
29
28
|
|
|
30
29
|
attr_accessor :already_in_an_inputs_block
|
|
31
30
|
|
|
32
|
-
def
|
|
33
|
-
|
|
34
|
-
human(count: ::ActiveAdmin::Helpers::I18n::PLURAL_MANY_COUNT)
|
|
31
|
+
def has_many(assoc, options = {}, &block)
|
|
32
|
+
HasManyBuilder.new(self, assoc, options).render(&block)
|
|
35
33
|
end
|
|
34
|
+
end
|
|
36
35
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
36
|
+
# Decorates a FormBuilder with the additional attributes and methods
|
|
37
|
+
# to build a has_many block. Nested has_many blocks are handled by
|
|
38
|
+
# nested decorators.
|
|
39
|
+
class HasManyBuilder < SimpleDelegator
|
|
40
|
+
attr_reader :assoc
|
|
41
|
+
attr_reader :options
|
|
42
|
+
attr_reader :heading, :sortable_column, :sortable_start
|
|
43
|
+
attr_reader :new_record, :destroy_option, :remove_record
|
|
44
|
+
|
|
45
|
+
def initialize(has_many_form, assoc, options)
|
|
46
|
+
super has_many_form
|
|
47
|
+
@assoc = assoc
|
|
48
|
+
@options = extract_custom_settings!(options.dup)
|
|
49
|
+
@options.reverse_merge!(for: assoc)
|
|
50
|
+
@options[:class] = [options[:class], "inputs has_many_fields"].compact.join(" ")
|
|
45
51
|
|
|
46
52
|
if sortable_column
|
|
47
|
-
options[:for] = [assoc, sorted_children(
|
|
53
|
+
@options[:for] = [assoc, sorted_children(sortable_column)]
|
|
48
54
|
end
|
|
55
|
+
end
|
|
49
56
|
|
|
57
|
+
def render(&block)
|
|
50
58
|
html = "".html_safe
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
59
|
+
html << template.content_tag(:h3) { heading } if heading.present?
|
|
60
|
+
html << template.capture { content_has_many(&block) }
|
|
61
|
+
html = wrap_div_or_li(html)
|
|
62
|
+
template.concat(html) if template.output_buffer
|
|
63
|
+
html
|
|
64
|
+
end
|
|
56
65
|
|
|
57
|
-
|
|
58
|
-
form_block = proc do |has_many_form|
|
|
59
|
-
index = parent_child_index options[:parent] if options[:parent]
|
|
60
|
-
block_contents = template.capture do
|
|
61
|
-
block.call(has_many_form, index)
|
|
62
|
-
end
|
|
63
|
-
template.concat(block_contents)
|
|
64
|
-
template.concat has_many_actions(has_many_form, builder_options, "".html_safe)
|
|
65
|
-
end
|
|
66
|
+
protected
|
|
66
67
|
|
|
67
|
-
|
|
68
|
-
|
|
68
|
+
# remove options that should not render as attributes
|
|
69
|
+
def extract_custom_settings!(options)
|
|
70
|
+
@heading = options.key?(:heading) ? options.delete(:heading) : default_heading
|
|
71
|
+
@sortable_column = options.delete(:sortable)
|
|
72
|
+
@sortable_start = options.delete(:sortable_start) || 0
|
|
73
|
+
@new_record = options.key?(:new_record) ? options.delete(:new_record) : true
|
|
74
|
+
@destroy_option = options.delete(:allow_destroy)
|
|
75
|
+
@remove_record = options.delete(:remove_record)
|
|
76
|
+
options
|
|
77
|
+
end
|
|
69
78
|
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
79
|
+
def default_heading
|
|
80
|
+
assoc_klass.model_name.
|
|
81
|
+
human(count: ::ActiveAdmin::Helpers::I18n::PLURAL_MANY_COUNT)
|
|
82
|
+
end
|
|
83
|
+
|
|
84
|
+
def assoc_klass
|
|
85
|
+
@assoc_klass ||= __getobj__.object.class.reflect_on_association(assoc).klass
|
|
86
|
+
end
|
|
87
|
+
|
|
88
|
+
def content_has_many(&block)
|
|
89
|
+
form_block = proc do |form_builder|
|
|
90
|
+
render_has_many_form(form_builder, options[:parent], &block)
|
|
75
91
|
end
|
|
76
92
|
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
93
|
+
template.assigns[:has_many_block] = true
|
|
94
|
+
contents = without_wrapper { inputs(options, &form_block) }
|
|
95
|
+
contents ||= "".html_safe
|
|
96
|
+
|
|
97
|
+
js = new_record ? js_for_has_many(options[:class], &form_block) : ""
|
|
98
|
+
contents << js
|
|
81
99
|
end
|
|
82
100
|
|
|
83
|
-
|
|
101
|
+
# Renders the Formtastic inputs then appends ActiveAdmin delete and sort actions.
|
|
102
|
+
def render_has_many_form(form_builder, parent, &block)
|
|
103
|
+
index = parent && form_builder.send(:parent_child_index, parent)
|
|
104
|
+
template.concat template.capture { yield(form_builder, index) }
|
|
105
|
+
template.concat has_many_actions(form_builder, "".html_safe)
|
|
106
|
+
end
|
|
84
107
|
|
|
85
|
-
def has_many_actions(
|
|
86
|
-
if
|
|
108
|
+
def has_many_actions(form_builder, contents)
|
|
109
|
+
if form_builder.object.new_record?
|
|
87
110
|
contents << template.content_tag(:li) do
|
|
88
|
-
|
|
111
|
+
remove_text = remove_record.is_a?(String) ? remove_record : I18n.t("active_admin.has_many_remove")
|
|
112
|
+
template.link_to remove_text, "#", class: "button has_many_remove"
|
|
89
113
|
end
|
|
90
|
-
elsif
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
wrapper_html: {class: 'has_many_delete'},
|
|
96
|
-
label: I18n.t('active_admin.has_many_delete'))
|
|
114
|
+
elsif allow_destroy?(form_builder.object)
|
|
115
|
+
form_builder.input(
|
|
116
|
+
:_destroy, as: :boolean,
|
|
117
|
+
wrapper_html: { class: "has_many_delete" },
|
|
118
|
+
label: I18n.t("active_admin.has_many_delete"))
|
|
97
119
|
end
|
|
98
120
|
|
|
99
|
-
if
|
|
100
|
-
|
|
121
|
+
if sortable_column
|
|
122
|
+
form_builder.input sortable_column, as: :hidden
|
|
101
123
|
|
|
102
|
-
contents << template.content_tag(:li, class:
|
|
103
|
-
I18n.t(
|
|
124
|
+
contents << template.content_tag(:li, class: "handle") do
|
|
125
|
+
I18n.t("active_admin.move")
|
|
104
126
|
end
|
|
105
127
|
end
|
|
106
128
|
|
|
107
129
|
contents
|
|
108
130
|
end
|
|
109
131
|
|
|
110
|
-
def
|
|
111
|
-
|
|
132
|
+
def allow_destroy?(form_object)
|
|
133
|
+
!! case destroy_option
|
|
134
|
+
when Symbol, String
|
|
135
|
+
form_object.public_send destroy_option
|
|
136
|
+
when Proc
|
|
137
|
+
destroy_option.call form_object
|
|
138
|
+
else
|
|
139
|
+
destroy_option
|
|
140
|
+
end
|
|
141
|
+
end
|
|
142
|
+
|
|
143
|
+
def sorted_children(column)
|
|
144
|
+
__getobj__.object.public_send(assoc).sort_by do |o|
|
|
112
145
|
attribute = o.public_send column
|
|
113
146
|
[attribute.nil? ? Float::INFINITY : attribute, o.id || Float::INFINITY]
|
|
114
147
|
end
|
|
115
148
|
end
|
|
116
149
|
|
|
117
|
-
private
|
|
118
|
-
|
|
119
150
|
def without_wrapper
|
|
120
|
-
is_being_wrapped =
|
|
121
|
-
|
|
151
|
+
is_being_wrapped = already_in_an_inputs_block
|
|
152
|
+
self.already_in_an_inputs_block = false
|
|
122
153
|
|
|
123
154
|
html = yield
|
|
124
155
|
|
|
125
|
-
|
|
156
|
+
self.already_in_an_inputs_block = is_being_wrapped
|
|
126
157
|
html
|
|
127
158
|
end
|
|
128
159
|
|
|
129
160
|
# Capture the ADD JS
|
|
130
|
-
def js_for_has_many(
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
placeholder = "NEW_#{assoc_name.to_s.underscore.upcase.gsub(/\//, '_')}_RECORD"
|
|
161
|
+
def js_for_has_many(class_string, &form_block)
|
|
162
|
+
assoc_name = assoc_klass.model_name
|
|
163
|
+
placeholder = "NEW_#{assoc_name.to_s.underscore.upcase.gsub(/\//, '_')}_RECORD"
|
|
134
164
|
opts = {
|
|
135
|
-
for: [assoc,
|
|
165
|
+
for: [assoc, assoc_klass.new],
|
|
136
166
|
class: class_string,
|
|
137
167
|
for_options: { child_index: placeholder }
|
|
138
168
|
}
|
|
139
|
-
html = template.capture{ inputs_for_nested_attributes opts, &form_block }
|
|
140
|
-
text = new_record.is_a?(String) ? new_record : I18n.t(
|
|
169
|
+
html = template.capture { __getobj__.send(:inputs_for_nested_attributes, opts, &form_block) }
|
|
170
|
+
text = new_record.is_a?(String) ? new_record : I18n.t("active_admin.has_many_new", model: assoc_name.human)
|
|
141
171
|
|
|
142
|
-
template.link_to text,
|
|
172
|
+
template.link_to text, "#", class: "button has_many_add", data: {
|
|
143
173
|
html: CGI.escapeHTML(html).html_safe, placeholder: placeholder
|
|
144
174
|
}
|
|
145
175
|
end
|
|
176
|
+
|
|
177
|
+
def wrap_div_or_li(html)
|
|
178
|
+
template.content_tag(
|
|
179
|
+
already_in_an_inputs_block ? :li : :div,
|
|
180
|
+
html,
|
|
181
|
+
class: "has_many_container #{assoc}",
|
|
182
|
+
"data-sortable" => sortable_column,
|
|
183
|
+
"data-sortable-start" => sortable_start)
|
|
184
|
+
end
|
|
146
185
|
end
|
|
147
186
|
end
|
|
@@ -9,8 +9,16 @@ module ActiveAdmin
|
|
|
9
9
|
@class_name.constantize.new.attributes.keys
|
|
10
10
|
end
|
|
11
11
|
|
|
12
|
+
def assignable_attributes
|
|
13
|
+
attributes - %w(id created_at updated_at)
|
|
14
|
+
end
|
|
15
|
+
|
|
16
|
+
def permit_params
|
|
17
|
+
assignable_attributes.map { |a| a.to_sym.inspect }.join(", ")
|
|
18
|
+
end
|
|
19
|
+
|
|
12
20
|
def rows
|
|
13
|
-
attributes.map { |a| row(a) }.join("\n")
|
|
21
|
+
attributes.map { |a| row(a) }.join("\n ")
|
|
14
22
|
end
|
|
15
23
|
|
|
16
24
|
def row(name)
|
|
@@ -18,7 +26,7 @@ module ActiveAdmin
|
|
|
18
26
|
end
|
|
19
27
|
|
|
20
28
|
def columns
|
|
21
|
-
attributes.map { |a| column(a) }.join("\n")
|
|
29
|
+
attributes.map { |a| column(a) }.join("\n ")
|
|
22
30
|
end
|
|
23
31
|
|
|
24
32
|
def column(name)
|
|
@@ -26,7 +34,7 @@ module ActiveAdmin
|
|
|
26
34
|
end
|
|
27
35
|
|
|
28
36
|
def filters
|
|
29
|
-
attributes.map { |a| filter(a) }.join("\n")
|
|
37
|
+
attributes.map { |a| filter(a) }.join("\n ")
|
|
30
38
|
end
|
|
31
39
|
|
|
32
40
|
def filter(name)
|
|
@@ -34,7 +42,7 @@ module ActiveAdmin
|
|
|
34
42
|
end
|
|
35
43
|
|
|
36
44
|
def form_inputs
|
|
37
|
-
|
|
45
|
+
assignable_attributes.map { |a| form_input(a) }.join("\n ")
|
|
38
46
|
end
|
|
39
47
|
|
|
40
48
|
def form_input(name)
|
|
@@ -15,7 +15,7 @@ module ActiveAdmin
|
|
|
15
15
|
|
|
16
16
|
module OptionalDisplay
|
|
17
17
|
def display_on?(action, render_context = self)
|
|
18
|
-
return false if @options[:only]
|
|
18
|
+
return false if @options[:only] && !@options[:only].include?(action.to_sym)
|
|
19
19
|
return false if @options[:except] && @options[:except].include?(action.to_sym)
|
|
20
20
|
|
|
21
21
|
case condition = @options[:if]
|
|
@@ -31,7 +31,7 @@ module ActiveAdmin
|
|
|
31
31
|
private
|
|
32
32
|
|
|
33
33
|
def normalize_display_options!
|
|
34
|
-
@options[:only]
|
|
34
|
+
@options[:only] = Array(@options[:only]) if @options[:only]
|
|
35
35
|
@options[:except] = Array(@options[:except]) if @options[:except]
|
|
36
36
|
end
|
|
37
37
|
end
|
|
@@ -3,16 +3,23 @@ module ActiveAdmin
|
|
|
3
3
|
class DatepickerInput < ::Formtastic::Inputs::StringInput
|
|
4
4
|
def input_html_options
|
|
5
5
|
super.tap do |options|
|
|
6
|
-
options[:class] = [options[:class], "datepicker"].compact.join(
|
|
6
|
+
options[:class] = [options[:class], "datepicker"].compact.join(" ")
|
|
7
7
|
options[:data] ||= {}
|
|
8
8
|
options[:data].merge! datepicker_options
|
|
9
9
|
end
|
|
10
10
|
end
|
|
11
11
|
|
|
12
|
+
# Can pass proc to filter label option
|
|
13
|
+
def label_from_options
|
|
14
|
+
res = super
|
|
15
|
+
res = res.call if res.is_a? Proc
|
|
16
|
+
res
|
|
17
|
+
end
|
|
18
|
+
|
|
12
19
|
private
|
|
13
20
|
def datepicker_options
|
|
14
21
|
options = self.options.fetch(:datepicker_options, {})
|
|
15
|
-
options = Hash[options.map{ |k, v| [k.to_s.camelcase(:lower), v] }]
|
|
22
|
+
options = Hash[options.map { |k, v| [k.to_s.camelcase(:lower), v] }]
|
|
16
23
|
{ datepicker_options: options }
|
|
17
24
|
end
|
|
18
25
|
end
|
|
@@ -31,15 +31,15 @@ module ActiveAdmin
|
|
|
31
31
|
|
|
32
32
|
def wrapper_html_options
|
|
33
33
|
opts = super
|
|
34
|
-
(opts[:class] ||=
|
|
34
|
+
(opts[:class] ||= "") << " select_and_search" unless seems_searchable?
|
|
35
35
|
opts
|
|
36
36
|
end
|
|
37
37
|
|
|
38
38
|
def to_html
|
|
39
39
|
input_wrapping do
|
|
40
|
-
label_html
|
|
40
|
+
label_html << # your label
|
|
41
41
|
select_html << # the dropdown that holds the available search methods
|
|
42
|
-
input_html
|
|
42
|
+
input_html # your input field
|
|
43
43
|
end
|
|
44
44
|
end
|
|
45
45
|
|
|
@@ -48,7 +48,7 @@ module ActiveAdmin
|
|
|
48
48
|
end
|
|
49
49
|
|
|
50
50
|
def select_html
|
|
51
|
-
template.select_tag
|
|
51
|
+
template.select_tag "", template.options_for_select(filter_options, current_filter)
|
|
52
52
|
end
|
|
53
53
|
|
|
54
54
|
def filters
|
|
@@ -57,8 +57,8 @@ module ActiveAdmin
|
|
|
57
57
|
|
|
58
58
|
def current_filter
|
|
59
59
|
@current_filter ||= begin
|
|
60
|
-
methods = filters.map{ |f| "#{method}_#{f}" }
|
|
61
|
-
methods.detect{ |m| @object.public_send m } || methods.first
|
|
60
|
+
methods = filters.map { |f| "#{method}_#{f}" }
|
|
61
|
+
methods.detect { |m| @object.public_send m } || methods.first
|
|
62
62
|
end
|
|
63
63
|
end
|
|
64
64
|
|