activeadmin 1.4.3 → 3.0.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of activeadmin might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CHANGELOG.md +609 -26
- data/CONTRIBUTING.md +54 -76
- data/README.md +46 -13
- 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 +3 -25
- 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/_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 +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/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 +98 -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 +1 -1
- 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 +1 -1
- data/app/views/active_admin/devise/passwords/new.html.erb +1 -1
- data/app/views/active_admin/devise/registrations/new.html.erb +1 -2
- data/app/views/active_admin/devise/shared/_error_messages.html.erb +15 -0
- data/app/views/active_admin/devise/shared/_links.erb +1 -1
- data/app/views/active_admin/devise/unlocks/new.html.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/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.html.arb +1 -0
- data/app/views/layouts/active_admin_logged_out.html.erb +19 -8
- data/config/locales/ar.yml +9 -15
- data/config/locales/az.yml +131 -0
- data/config/locales/bg.yml +1 -8
- data/config/locales/bs.yml +1 -7
- data/config/locales/ca.yml +1 -8
- data/config/locales/cs.yml +1 -7
- data/config/locales/da.yml +1 -7
- data/config/locales/de-CH.yml +1 -7
- data/config/locales/de.yml +19 -8
- data/config/locales/el.yml +1 -7
- data/config/locales/en-CA.yml +4 -10
- data/config/locales/en-GB.yml +4 -10
- data/config/locales/en.yml +4 -11
- data/config/locales/eo.yml +1 -8
- data/config/locales/es-MX.yml +3 -8
- data/config/locales/es.yml +6 -13
- data/config/locales/fa.yml +1 -7
- data/config/locales/fi.yml +1 -7
- data/config/locales/fr.yml +9 -16
- data/config/locales/he.yml +1 -10
- data/config/locales/hr.yml +1 -7
- data/config/locales/hu.yml +3 -6
- data/config/locales/id.yml +1 -7
- data/config/locales/it.yml +19 -8
- data/config/locales/ja.yml +3 -10
- data/config/locales/ko.yml +2 -8
- data/config/locales/lt.yml +3 -10
- data/config/locales/lv.yml +3 -9
- data/config/locales/mk.yml +126 -0
- data/config/locales/nb.yml +1 -8
- data/config/locales/nl.yml +2 -9
- data/config/locales/pl.yml +1 -8
- data/config/locales/pt-BR.yml +1 -8
- data/config/locales/pt-PT.yml +1 -7
- data/config/locales/ro.yml +4 -9
- data/config/locales/ru.yml +1 -6
- data/config/locales/sk.yml +58 -6
- data/config/locales/sv-SE.yml +59 -39
- data/config/locales/tr.yml +1 -11
- data/config/locales/uk.yml +3 -6
- data/config/locales/vi.yml +40 -19
- data/config/locales/zh-CN.yml +35 -23
- data/config/locales/zh-TW.yml +1 -7
- data/lib/active_admin/abstract_view_factory.rb +1 -0
- data/lib/active_admin/application.rb +26 -33
- data/lib/active_admin/application_settings.rb +7 -3
- data/lib/active_admin/asset_registration.rb +4 -11
- data/lib/active_admin/authorization_adapter.rb +6 -3
- data/lib/active_admin/base_controller/authorization.rb +17 -16
- data/lib/active_admin/base_controller/menu.rb +1 -0
- data/lib/active_admin/base_controller.rb +12 -11
- data/lib/active_admin/batch_actions/controller.rb +5 -4
- data/lib/active_admin/batch_actions/resource_extension.rb +16 -10
- 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 +2 -1
- 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 +3 -1
- data/lib/active_admin/csv_builder.rb +15 -23
- data/lib/active_admin/dependency.rb +12 -87
- data/lib/active_admin/deprecation.rb +1 -0
- data/lib/active_admin/devise.rb +16 -5
- data/lib/active_admin/dsl.rb +3 -9
- 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 +5 -4
- data/lib/active_admin/filters/active.rb +2 -1
- data/lib/active_admin/filters/active_filter.rb +11 -10
- data/lib/active_admin/filters/active_sidebar.rb +8 -30
- data/lib/active_admin/filters/dsl.rb +1 -0
- data/lib/active_admin/filters/forms.rb +9 -8
- data/lib/active_admin/filters/formtastic_addons.rb +3 -7
- data/lib/active_admin/filters/resource_extension.rb +33 -8
- data/lib/active_admin/filters.rb +8 -7
- data/lib/active_admin/form_builder.rb +27 -22
- data/lib/active_admin/generators/boilerplate.rb +13 -4
- 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 +2 -0
- data/lib/active_admin/inputs/datepicker_input.rb +3 -2
- data/lib/active_admin/inputs/filters/base/search_method_select.rb +9 -8
- 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 +18 -14
- data/lib/active_admin/inputs/filters/numeric_input.rb +2 -1
- data/lib/active_admin/inputs/filters/select_input.rb +3 -2
- data/lib/active_admin/inputs/filters/string_input.rb +2 -1
- 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 +28 -8
- data/lib/active_admin/order_clause.rb +3 -2
- data/lib/active_admin/orm/active_record/comments/comment.rb +13 -4
- 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 +30 -24
- data/lib/active_admin/orm/active_record/comments/views.rb +3 -2
- data/lib/active_admin/orm/active_record/comments.rb +30 -29
- 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 +2 -1
- data/lib/active_admin/page_presenter.rb +3 -1
- data/lib/active_admin/pundit_adapter.rb +71 -16
- data/lib/active_admin/resource/action_items.rb +6 -5
- data/lib/active_admin/resource/attributes.rb +9 -5
- data/lib/active_admin/resource/belongs_to.rb +9 -3
- 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 +6 -5
- data/lib/active_admin/resource/model.rb +16 -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 +26 -14
- data/lib/active_admin/resource/scope_to.rb +8 -7
- data/lib/active_admin/resource/scopes.rb +4 -3
- data/lib/active_admin/resource/sidebars.rb +3 -2
- data/lib/active_admin/resource.rb +37 -22
- data/lib/active_admin/resource_collection.rb +3 -2
- data/lib/active_admin/resource_controller/action_builder.rb +11 -0
- data/lib/active_admin/resource_controller/data_access.rb +31 -5
- data/lib/active_admin/resource_controller/decorators.rb +8 -29
- data/lib/active_admin/resource_controller/polymorphic_routes.rb +38 -0
- data/lib/active_admin/resource_controller/resource_class_methods.rb +3 -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 +14 -10
- data/lib/active_admin/resource_dsl.rb +16 -28
- data/lib/active_admin/router.rb +4 -2
- data/lib/active_admin/scope.rb +16 -11
- data/lib/active_admin/settings_node.rb +2 -1
- data/lib/active_admin/sidebar_section.rb +4 -1
- 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 +6 -5
- data/lib/active_admin/view_helpers/display_helper.rb +32 -8
- data/lib/active_admin/view_helpers/download_format_links_helper.rb +3 -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 +3 -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 +14 -11
- data/lib/active_admin/views/components/active_filters_sidebar_content.rb +59 -0
- data/lib/active_admin/views/components/attributes_table.rb +9 -8
- 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 +22 -20
- 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 -3
- data/lib/active_admin/views/components/site_title.rb +2 -1
- data/lib/active_admin/views/components/status_tag.rb +14 -26
- data/lib/active_admin/views/components/table_for.rb +21 -19
- data/lib/active_admin/views/components/tabs.rb +14 -4
- data/lib/active_admin/views/components/unsupported_browser.rb +1 -0
- data/lib/active_admin/views/footer.rb +4 -2
- 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 +27 -22
- data/lib/active_admin/views/pages/base.rb +25 -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 +2 -7
- 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 +67 -63
- 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.js +1 -0
- 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 +19 -8
- data/lib/generators/active_admin/install/templates/active_admin.rb.erb +62 -3
- data/lib/generators/active_admin/install/templates/dashboard.rb +3 -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 +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/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 +27 -0
- 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 +115 -173
- data/.circleci/config.yml +0 -572
- data/.github/ISSUE_TEMPLATE.md +0 -20
- data/.gitignore +0 -16
- data/.mdlrc +0 -1
- data/.rspec +0 -1
- data/.rspec_parallel +0 -2
- data/.rubocop.yml +0 -99
- data/.simplecov +0 -9
- data/.yardopts +0 -7
- data/Gemfile +0 -30
- data/Gemfile.common +0 -26
- data/Gemfile.lock +0 -433
- data/Rakefile +0 -24
- 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/bin/install_chromedriver.sh +0 -17
- data/config/i18n-tasks.yml +0 -26
- data/config/mdl_style.rb +0 -11
- data/cucumber.yml +0 -7
- 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 -201
- 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 -227
- 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 -4
- data/docs/Gemfile.lock +0 -249
- data/docs/README.md +0 -24
- data/docs/_config.yml +0 -2
- 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 -125
- data/docs/stylesheets/main.css +0 -1176
- data/gemfiles/rails_42.gemfile +0 -10
- data/gemfiles/rails_42.gemfile.lock +0 -339
- data/gemfiles/rails_50.gemfile +0 -10
- data/gemfiles/rails_50.gemfile.lock +0 -353
- data/gemfiles/rails_51.gemfile +0 -10
- data/gemfiles/rails_51.gemfile.lock +0 -353
- data/lib/active_admin/event.rb +0 -24
- data/lib/active_admin/helpers/output_safety_helper.rb +0 -35
- data/lib/active_admin/reloader.rb +0 -25
- data/lib/bug_report_templates/active_admin_master.rb +0 -111
- data/lib/generators/active_admin/assets/templates/active_admin.js.coffee +0 -1
- data/lib/ransack_ext.rb +0 -20
- data/tasks/application_generator.rb +0 -50
- data/tasks/docs.rake +0 -64
- data/tasks/gemfiles.rake +0 -8
- data/tasks/lint.rake +0 -110
- data/tasks/local.rake +0 -27
- data/tasks/release.rake +0 -6
- data/tasks/test.rake +0 -42
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module ActiveAdmin
|
2
3
|
module Filters
|
3
4
|
# This form builder defines methods to build filter forms such
|
@@ -20,7 +21,7 @@ module ActiveAdmin
|
|
20
21
|
# Returns the default filter type for a given attribute. If you want
|
21
22
|
# to use a custom search method, you have to specify the type yourself.
|
22
23
|
def default_input_type(method, options = {})
|
23
|
-
if method =~ /_(eq|
|
24
|
+
if method =~ /_(eq|cont|start|end)\z/
|
24
25
|
:string
|
25
26
|
elsif klass._ransackers.key?(method.to_s)
|
26
27
|
klass._ransackers[method.to_s].type
|
@@ -48,15 +49,15 @@ module ActiveAdmin
|
|
48
49
|
def active_admin_filters_form_for(search, filters, options = {})
|
49
50
|
defaults = { builder: ActiveAdmin::Filters::FormBuilder,
|
50
51
|
url: collection_path,
|
51
|
-
html: {class:
|
52
|
-
required = { html: {method: :get},
|
52
|
+
html: { class: "filter_form" } }
|
53
|
+
required = { html: { method: :get },
|
53
54
|
as: :q }
|
54
|
-
options
|
55
|
+
options = defaults.deep_merge(options).deep_merge(required)
|
55
56
|
|
56
57
|
form_for search, options do |f|
|
57
58
|
filters.each do |attribute, opts|
|
58
|
-
next if opts.key?(:if)
|
59
|
-
next if opts.key?(:unless) &&
|
59
|
+
next if opts.key?(:if) && !call_method_or_proc_on(self, opts[:if])
|
60
|
+
next if opts.key?(:unless) && call_method_or_proc_on(self, opts[:unless])
|
60
61
|
|
61
62
|
filter_opts = opts.except(:if, :unless)
|
62
63
|
filter_opts[:input_html] = instance_exec(&filter_opts[:input_html]) if filter_opts[:input_html].is_a?(Proc)
|
@@ -65,8 +66,8 @@ module ActiveAdmin
|
|
65
66
|
end
|
66
67
|
|
67
68
|
buttons = content_tag :div, class: "buttons" do
|
68
|
-
f.submit(I18n.t(
|
69
|
-
link_to(I18n.t(
|
69
|
+
f.submit(I18n.t("active_admin.filters.buttons.filter")) +
|
70
|
+
link_to(I18n.t("active_admin.filters.buttons.clear"), "#", class: "clear_filters_btn") +
|
70
71
|
hidden_field_tags_for(params, except: except_hidden_fields)
|
71
72
|
end
|
72
73
|
|
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module ActiveAdmin
|
2
3
|
module Filters
|
3
4
|
module FormtasticAddons
|
@@ -37,7 +38,7 @@ module ActiveAdmin
|
|
37
38
|
end
|
38
39
|
|
39
40
|
def polymorphic_foreign_type?(method)
|
40
|
-
klass.reflect_on_all_associations.select{ |r| r.macro == :belongs_to && r.options[:polymorphic] }
|
41
|
+
klass.reflect_on_all_associations.select { |r| r.macro == :belongs_to && r.options[:polymorphic] }
|
41
42
|
.map(&:foreign_type).include? method.to_s
|
42
43
|
end
|
43
44
|
|
@@ -54,7 +55,7 @@ module ActiveAdmin
|
|
54
55
|
end
|
55
56
|
|
56
57
|
def seems_searchable?
|
57
|
-
has_predicate? || scope?
|
58
|
+
column_for(method).nil? && (has_predicate? || scope?)
|
58
59
|
end
|
59
60
|
|
60
61
|
# If the given method has a predicate (like _eq or _lteq), it's pretty
|
@@ -63,11 +64,6 @@ module ActiveAdmin
|
|
63
64
|
!!Ransack::Predicate.detect_from_string(method.to_s)
|
64
65
|
end
|
65
66
|
|
66
|
-
# Ransack lets you define custom search methods, called ransackers.
|
67
|
-
def ransacker?
|
68
|
-
klass._ransackers.key? method.to_s
|
69
|
-
end
|
70
|
-
|
71
67
|
# Ransack supports exposing selected scopes on your model for advanced searches.
|
72
68
|
def scope?
|
73
69
|
context = Ransack::Context.for klass
|
@@ -1,9 +1,10 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module ActiveAdmin
|
2
3
|
module Filters
|
3
4
|
|
4
5
|
class Disabled < RuntimeError
|
5
|
-
def initialize
|
6
|
-
super "
|
6
|
+
def initialize(action)
|
7
|
+
super "Cannot #{action} a filter when filters are disabled. Enable filters with 'config.filters = true'"
|
7
8
|
end
|
8
9
|
end
|
9
10
|
|
@@ -60,7 +61,7 @@ module ActiveAdmin
|
|
60
61
|
#
|
61
62
|
# @param [Symbol] attributes The attributes to not filter on
|
62
63
|
def remove_filter(*attributes)
|
63
|
-
raise Disabled unless filters_enabled?
|
64
|
+
raise Disabled, "remove" unless filters_enabled?
|
64
65
|
|
65
66
|
attributes.each { |attribute| (@filters_to_remove ||= []) << attribute.to_sym }
|
66
67
|
end
|
@@ -72,7 +73,7 @@ module ActiveAdmin
|
|
72
73
|
# @param [Hash] options The set of options that are passed through to
|
73
74
|
# ransack for the field definition.
|
74
75
|
def add_filter(attribute, options = {})
|
75
|
-
raise Disabled unless filters_enabled?
|
76
|
+
raise Disabled, "add" unless filters_enabled?
|
76
77
|
|
77
78
|
(@filters ||= {})[attribute.to_sym] = options
|
78
79
|
end
|
@@ -123,25 +124,49 @@ module ActiveAdmin
|
|
123
124
|
# Returns a default set of filters for the associations
|
124
125
|
def default_association_filters
|
125
126
|
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] }
|
127
|
+
poly, not_poly = resource_class.reflect_on_all_associations.partition { |r| r.macro == :belongs_to && r.options[:polymorphic] }
|
127
128
|
|
128
129
|
# remove deeply nested associations
|
129
|
-
not_poly.reject!{ |r| r.chain.length > 2 }
|
130
|
+
not_poly.reject! { |r| r.chain.length > 2 }
|
130
131
|
|
131
132
|
filters = poly.map(&:foreign_type) + not_poly.map(&:name)
|
133
|
+
|
134
|
+
# Check high-arity associations for filterable columns
|
135
|
+
max = namespace.maximum_association_filter_arity
|
136
|
+
if max != :unlimited
|
137
|
+
high_arity, low_arity = not_poly.partition do |r|
|
138
|
+
r.klass.reorder(nil).limit(max + 1).count > max
|
139
|
+
end
|
140
|
+
|
141
|
+
# Remove high-arity associations with no searchable column
|
142
|
+
high_arity = high_arity.select(&method(:searchable_column_for))
|
143
|
+
|
144
|
+
high_arity = high_arity.map { |r| r.name.to_s + "_" + searchable_column_for(r) + namespace.filter_method_for_large_association }
|
145
|
+
|
146
|
+
filters = poly.map(&:foreign_type) + low_arity.map(&:name) + high_arity
|
147
|
+
end
|
148
|
+
|
132
149
|
filters.map &:to_sym
|
133
150
|
else
|
134
151
|
[]
|
135
152
|
end
|
136
153
|
end
|
137
154
|
|
155
|
+
def search_columns
|
156
|
+
@search_columns ||= namespace.filter_columns_for_large_association.map(&:to_s)
|
157
|
+
end
|
158
|
+
|
159
|
+
def searchable_column_for(relation)
|
160
|
+
relation.klass.column_names.find { |name| search_columns.include?(name) }
|
161
|
+
end
|
162
|
+
|
138
163
|
def add_filters_sidebar_section
|
139
164
|
self.sidebar_sections << filters_sidebar_section
|
140
165
|
end
|
141
166
|
|
142
167
|
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
|
168
|
+
ActiveAdmin::SidebarSection.new :filters, only: :index, if: -> { active_admin_config.filters.any? } do
|
169
|
+
active_admin_filters_form_for assigns[:search], **active_admin_config.filters
|
145
170
|
end
|
146
171
|
end
|
147
172
|
|
data/lib/active_admin/filters.rb
CHANGED
@@ -1,11 +1,12 @@
|
|
1
|
-
|
2
|
-
require
|
3
|
-
require
|
4
|
-
require
|
5
|
-
require
|
6
|
-
require
|
1
|
+
# frozen_string_literal: true
|
2
|
+
require "active_admin/filters/dsl"
|
3
|
+
require "active_admin/filters/resource_extension"
|
4
|
+
require "active_admin/filters/formtastic_addons"
|
5
|
+
require "active_admin/filters/forms"
|
6
|
+
require "active_admin/helpers/optional_display"
|
7
|
+
require "active_admin/filters/active_sidebar"
|
7
8
|
|
8
9
|
# Add our Extensions
|
9
10
|
ActiveAdmin::ResourceDSL.send :include, ActiveAdmin::Filters::DSL
|
10
|
-
ActiveAdmin::Resource.send
|
11
|
+
ActiveAdmin::Resource.send :include, ActiveAdmin::Filters::ResourceExtension
|
11
12
|
ActiveAdmin::ViewHelpers.send :include, ActiveAdmin::Filters::ViewHelper
|
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
# Provides an intuitive way to build has_many associated records in the same form.
|
2
3
|
module Formtastic
|
3
4
|
module Inputs
|
@@ -20,9 +21,9 @@ module ActiveAdmin
|
|
20
21
|
self.input_class_finder = ::Formtastic::InputClassFinder
|
21
22
|
self.action_class_finder = ::Formtastic::ActionClassFinder
|
22
23
|
|
23
|
-
def cancel_link(url = {action: "index"}, html_options = {}, li_attrs = {})
|
24
|
+
def cancel_link(url = { action: "index" }, html_options = {}, li_attrs = {})
|
24
25
|
li_attrs[:class] ||= "cancel"
|
25
|
-
li_content = template.link_to I18n.t(
|
26
|
+
li_content = template.link_to I18n.t("active_admin.cancel"), url, html_options
|
26
27
|
template.content_tag(:li, li_content, li_attrs)
|
27
28
|
end
|
28
29
|
|
@@ -40,14 +41,14 @@ module ActiveAdmin
|
|
40
41
|
attr_reader :assoc
|
41
42
|
attr_reader :options
|
42
43
|
attr_reader :heading, :sortable_column, :sortable_start
|
43
|
-
attr_reader :new_record, :destroy_option
|
44
|
+
attr_reader :new_record, :destroy_option, :remove_record
|
44
45
|
|
45
46
|
def initialize(has_many_form, assoc, options)
|
46
47
|
super has_many_form
|
47
48
|
@assoc = assoc
|
48
49
|
@options = extract_custom_settings!(options.dup)
|
49
50
|
@options.reverse_merge!(for: assoc)
|
50
|
-
@options[:class] = [options[:class], "inputs has_many_fields"].compact.join(
|
51
|
+
@options[:class] = [options[:class], "inputs has_many_fields"].compact.join(" ")
|
51
52
|
|
52
53
|
if sortable_column
|
53
54
|
@options[:for] = [assoc, sorted_children(sortable_column)]
|
@@ -69,9 +70,10 @@ module ActiveAdmin
|
|
69
70
|
def extract_custom_settings!(options)
|
70
71
|
@heading = options.key?(:heading) ? options.delete(:heading) : default_heading
|
71
72
|
@sortable_column = options.delete(:sortable)
|
72
|
-
@sortable_start
|
73
|
+
@sortable_start = options.delete(:sortable_start) || 0
|
73
74
|
@new_record = options.key?(:new_record) ? options.delete(:new_record) : true
|
74
75
|
@destroy_option = options.delete(:allow_destroy)
|
76
|
+
@remove_record = options.delete(:remove_record)
|
75
77
|
options
|
76
78
|
end
|
77
79
|
|
@@ -93,7 +95,7 @@ module ActiveAdmin
|
|
93
95
|
contents = without_wrapper { inputs(options, &form_block) }
|
94
96
|
contents ||= "".html_safe
|
95
97
|
|
96
|
-
js = new_record ? js_for_has_many(options[:class], &form_block) :
|
98
|
+
js = new_record ? js_for_has_many(options[:class], &form_block) : ""
|
97
99
|
contents << js
|
98
100
|
end
|
99
101
|
|
@@ -107,19 +109,21 @@ module ActiveAdmin
|
|
107
109
|
def has_many_actions(form_builder, contents)
|
108
110
|
if form_builder.object.new_record?
|
109
111
|
contents << template.content_tag(:li) do
|
110
|
-
|
112
|
+
remove_text = remove_record.is_a?(String) ? remove_record : I18n.t("active_admin.has_many_remove")
|
113
|
+
template.link_to remove_text, "#", class: "button has_many_remove"
|
111
114
|
end
|
112
115
|
elsif allow_destroy?(form_builder.object)
|
113
|
-
form_builder.input(
|
114
|
-
|
115
|
-
|
116
|
+
form_builder.input(
|
117
|
+
:_destroy, as: :boolean,
|
118
|
+
wrapper_html: { class: "has_many_delete" },
|
119
|
+
label: I18n.t("active_admin.has_many_delete"))
|
116
120
|
end
|
117
121
|
|
118
122
|
if sortable_column
|
119
123
|
form_builder.input sortable_column, as: :hidden
|
120
124
|
|
121
|
-
contents << template.content_tag(:li, class:
|
122
|
-
I18n.t(
|
125
|
+
contents << template.content_tag(:li, class: "handle") do
|
126
|
+
I18n.t("active_admin.move")
|
123
127
|
end
|
124
128
|
end
|
125
129
|
|
@@ -156,27 +160,28 @@ module ActiveAdmin
|
|
156
160
|
|
157
161
|
# Capture the ADD JS
|
158
162
|
def js_for_has_many(class_string, &form_block)
|
159
|
-
assoc_name
|
160
|
-
placeholder
|
163
|
+
assoc_name = assoc_klass.model_name
|
164
|
+
placeholder = "NEW_#{assoc_name.to_s.underscore.upcase.gsub(/\//, '_')}_RECORD"
|
161
165
|
opts = {
|
162
166
|
for: [assoc, assoc_klass.new],
|
163
167
|
class: class_string,
|
164
168
|
for_options: { child_index: placeholder }
|
165
169
|
}
|
166
|
-
html = template.capture{ __getobj__.send(:inputs_for_nested_attributes, opts, &form_block) }
|
167
|
-
text = new_record.is_a?(String) ? new_record : I18n.t(
|
170
|
+
html = template.capture { __getobj__.send(:inputs_for_nested_attributes, opts, &form_block) }
|
171
|
+
text = new_record.is_a?(String) ? new_record : I18n.t("active_admin.has_many_new", model: assoc_name.human)
|
168
172
|
|
169
|
-
template.link_to text,
|
173
|
+
template.link_to text, "#", class: "button has_many_add", data: {
|
170
174
|
html: CGI.escapeHTML(html).html_safe, placeholder: placeholder
|
171
175
|
}
|
172
176
|
end
|
173
177
|
|
174
178
|
def wrap_div_or_li(html)
|
175
|
-
template.content_tag(
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
179
|
+
template.content_tag(
|
180
|
+
already_in_an_inputs_block ? :li : :div,
|
181
|
+
html,
|
182
|
+
class: "has_many_container #{assoc}",
|
183
|
+
"data-sortable" => sortable_column,
|
184
|
+
"data-sortable-start" => sortable_start)
|
180
185
|
end
|
181
186
|
end
|
182
187
|
end
|
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module ActiveAdmin
|
2
3
|
module Generators
|
3
4
|
class Boilerplate
|
@@ -9,8 +10,16 @@ module ActiveAdmin
|
|
9
10
|
@class_name.constantize.new.attributes.keys
|
10
11
|
end
|
11
12
|
|
13
|
+
def assignable_attributes
|
14
|
+
attributes - %w(id created_at updated_at)
|
15
|
+
end
|
16
|
+
|
17
|
+
def permit_params
|
18
|
+
assignable_attributes.map { |a| a.to_sym.inspect }.join(", ")
|
19
|
+
end
|
20
|
+
|
12
21
|
def rows
|
13
|
-
attributes.map { |a| row(a) }.join("\n")
|
22
|
+
attributes.map { |a| row(a) }.join("\n ")
|
14
23
|
end
|
15
24
|
|
16
25
|
def row(name)
|
@@ -18,7 +27,7 @@ module ActiveAdmin
|
|
18
27
|
end
|
19
28
|
|
20
29
|
def columns
|
21
|
-
attributes.map { |a| column(a) }.join("\n")
|
30
|
+
attributes.map { |a| column(a) }.join("\n ")
|
22
31
|
end
|
23
32
|
|
24
33
|
def column(name)
|
@@ -26,7 +35,7 @@ module ActiveAdmin
|
|
26
35
|
end
|
27
36
|
|
28
37
|
def filters
|
29
|
-
attributes.map { |a| filter(a) }.join("\n")
|
38
|
+
attributes.map { |a| filter(a) }.join("\n ")
|
30
39
|
end
|
31
40
|
|
32
41
|
def filter(name)
|
@@ -34,7 +43,7 @@ module ActiveAdmin
|
|
34
43
|
end
|
35
44
|
|
36
45
|
def form_inputs
|
37
|
-
|
46
|
+
assignable_attributes.map { |a| form_input(a) }.join("\n ")
|
38
47
|
end
|
39
48
|
|
40
49
|
def form_input(name)
|
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module ActiveAdmin
|
2
3
|
module Helpers
|
3
4
|
module Collection
|
@@ -5,6 +6,7 @@ module ActiveAdmin
|
|
5
6
|
# 2. correctly handles the Hash returned when `group by` is used
|
6
7
|
def collection_size(c = collection)
|
7
8
|
return c.count if c.is_a?(Array)
|
9
|
+
return c.length if c.limit_value
|
8
10
|
|
9
11
|
c = c.except :select, :order
|
10
12
|
|
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module ActiveAdmin
|
2
3
|
|
3
4
|
# Shareable module to give a #display_on?(action) method
|
@@ -15,7 +16,7 @@ module ActiveAdmin
|
|
15
16
|
|
16
17
|
module OptionalDisplay
|
17
18
|
def display_on?(action, render_context = self)
|
18
|
-
return false if @options[:only]
|
19
|
+
return false if @options[:only] && !@options[:only].include?(action.to_sym)
|
19
20
|
return false if @options[:except] && @options[:except].include?(action.to_sym)
|
20
21
|
|
21
22
|
case condition = @options[:if]
|
@@ -31,7 +32,7 @@ module ActiveAdmin
|
|
31
32
|
private
|
32
33
|
|
33
34
|
def normalize_display_options!
|
34
|
-
@options[:only]
|
35
|
+
@options[:only] = Array(@options[:only]) if @options[:only]
|
35
36
|
@options[:except] = Array(@options[:except]) if @options[:except]
|
36
37
|
end
|
37
38
|
end
|
@@ -1,9 +1,10 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module ActiveAdmin
|
2
3
|
module Inputs
|
3
4
|
class DatepickerInput < ::Formtastic::Inputs::StringInput
|
4
5
|
def input_html_options
|
5
6
|
super.tap do |options|
|
6
|
-
options[:class] = [options[:class], "datepicker"].compact.join(
|
7
|
+
options[:class] = [options[:class], "datepicker"].compact.join(" ")
|
7
8
|
options[:data] ||= {}
|
8
9
|
options[:data].merge! datepicker_options
|
9
10
|
end
|
@@ -19,7 +20,7 @@ module ActiveAdmin
|
|
19
20
|
private
|
20
21
|
def datepicker_options
|
21
22
|
options = self.options.fetch(:datepicker_options, {})
|
22
|
-
options = Hash[options.map{ |k, v| [k.to_s.camelcase(:lower), v] }]
|
23
|
+
options = Hash[options.map { |k, v| [k.to_s.camelcase(:lower), v] }]
|
23
24
|
{ datepicker_options: options }
|
24
25
|
end
|
25
26
|
end
|
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
# This is a common set of Formtastic overrides needed to build a filter form
|
2
3
|
# that lets you select from a set of search methods for a given attribute.
|
3
4
|
#
|
@@ -8,7 +9,7 @@
|
|
8
9
|
# include Base
|
9
10
|
# include Base::SearchMethodSelect
|
10
11
|
#
|
11
|
-
# filter :
|
12
|
+
# filter :eq, :gt, :lt
|
12
13
|
# end
|
13
14
|
#
|
14
15
|
module ActiveAdmin
|
@@ -31,15 +32,15 @@ module ActiveAdmin
|
|
31
32
|
|
32
33
|
def wrapper_html_options
|
33
34
|
opts = super
|
34
|
-
(opts[:class] ||=
|
35
|
+
(opts[:class] ||= "") << " select_and_search" unless seems_searchable?
|
35
36
|
opts
|
36
37
|
end
|
37
38
|
|
38
39
|
def to_html
|
39
40
|
input_wrapping do
|
40
|
-
label_html
|
41
|
+
label_html << # your label
|
41
42
|
select_html << # the dropdown that holds the available search methods
|
42
|
-
input_html
|
43
|
+
input_html # your input field
|
43
44
|
end
|
44
45
|
end
|
45
46
|
|
@@ -48,7 +49,7 @@ module ActiveAdmin
|
|
48
49
|
end
|
49
50
|
|
50
51
|
def select_html
|
51
|
-
template.select_tag
|
52
|
+
template.select_tag "", template.options_for_select(filter_options, current_filter)
|
52
53
|
end
|
53
54
|
|
54
55
|
def filters
|
@@ -57,14 +58,14 @@ module ActiveAdmin
|
|
57
58
|
|
58
59
|
def current_filter
|
59
60
|
@current_filter ||= begin
|
60
|
-
methods = filters.map{ |f| "#{method}_#{f}" }
|
61
|
-
methods.detect{ |m| @object.public_send m } || methods.first
|
61
|
+
methods = filters.map { |f| "#{method}_#{f}" }
|
62
|
+
methods.detect { |m| @object.public_send m } || methods.first
|
62
63
|
end
|
63
64
|
end
|
64
65
|
|
65
66
|
def filter_options
|
66
67
|
filters.collect do |filter|
|
67
|
-
[I18n.t("
|
68
|
+
[I18n.t("ransack.predicates.#{filter}").capitalize, "#{method}_#{filter}"]
|
68
69
|
end
|
69
70
|
end
|
70
71
|
|
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module ActiveAdmin
|
2
3
|
module Inputs
|
3
4
|
module Filters
|
@@ -25,7 +26,7 @@ module ActiveAdmin
|
|
25
26
|
|
26
27
|
def wrapper_html_options
|
27
28
|
opts = super
|
28
|
-
(opts[:class] ||=
|
29
|
+
(opts[:class] ||= "") << " filter_form_field filter_#{as}"
|
29
30
|
opts
|
30
31
|
end
|
31
32
|
|
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module ActiveAdmin
|
2
3
|
module Inputs
|
3
4
|
module Filters
|
@@ -16,7 +17,7 @@ module ActiveAdmin
|
|
16
17
|
|
17
18
|
# Provide the AA translation to the blank input field.
|
18
19
|
def include_blank
|
19
|
-
I18n.t
|
20
|
+
I18n.t "active_admin.any" if super
|
20
21
|
end
|
21
22
|
end
|
22
23
|
end
|
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module ActiveAdmin
|
2
3
|
module Inputs
|
3
4
|
module Filters
|
@@ -7,33 +8,36 @@ module ActiveAdmin
|
|
7
8
|
def to_html
|
8
9
|
input_wrapping do
|
9
10
|
[ label_html,
|
10
|
-
builder.text_field(gt_input_name,
|
11
|
-
builder.text_field(lt_input_name,
|
11
|
+
builder.text_field(gt_input_name, input_html_options_for(gt_input_name, gt_input_placeholder)),
|
12
|
+
builder.text_field(lt_input_name, input_html_options_for(lt_input_name, lt_input_placeholder)),
|
12
13
|
].join("\n").html_safe
|
13
14
|
end
|
14
15
|
end
|
15
16
|
|
16
17
|
def gt_input_name
|
17
|
-
|
18
|
+
"#{method}_gteq"
|
18
19
|
end
|
19
20
|
alias :input_name :gt_input_name
|
20
21
|
|
21
22
|
def lt_input_name
|
22
|
-
|
23
|
+
"#{method}_lteq"
|
23
24
|
end
|
24
25
|
|
25
|
-
def input_html_options
|
26
|
-
current_value = begin
|
27
|
-
#cast value to date object before rendering input
|
28
|
-
@object.public_send(input_name).to_s.to_date
|
29
|
-
rescue
|
30
|
-
nil
|
31
|
-
end
|
26
|
+
def input_html_options
|
32
27
|
{ size: 12,
|
33
28
|
class: "datepicker",
|
34
|
-
maxlength: 10
|
35
|
-
|
36
|
-
|
29
|
+
maxlength: 10 }.merge(options[:input_html] || {})
|
30
|
+
end
|
31
|
+
|
32
|
+
def input_html_options_for(input_name, placeholder)
|
33
|
+
current_value = begin
|
34
|
+
#cast value to date object before rendering input
|
35
|
+
@object.public_send(input_name).to_s.to_date
|
36
|
+
rescue
|
37
|
+
nil
|
38
|
+
end
|
39
|
+
{ placeholder: placeholder,
|
40
|
+
value: current_value ? current_value.strftime("%Y-%m-%d") : "" }.merge(input_html_options)
|
37
41
|
end
|
38
42
|
|
39
43
|
def gt_input_placeholder
|
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module ActiveAdmin
|
2
3
|
module Inputs
|
3
4
|
module Filters
|
@@ -5,7 +6,7 @@ module ActiveAdmin
|
|
5
6
|
include Base
|
6
7
|
include Base::SearchMethodSelect
|
7
8
|
|
8
|
-
filter :
|
9
|
+
filter :eq, :gt, :lt
|
9
10
|
end
|
10
11
|
end
|
11
12
|
end
|
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module ActiveAdmin
|
2
3
|
module Inputs
|
3
4
|
module Filters
|
@@ -7,7 +8,7 @@ module ActiveAdmin
|
|
7
8
|
def input_name
|
8
9
|
return method if seems_searchable?
|
9
10
|
|
10
|
-
searchable_method_name + (multiple? ?
|
11
|
+
searchable_method_name + (multiple? ? "_in" : "_eq")
|
11
12
|
end
|
12
13
|
|
13
14
|
def searchable_method_name
|
@@ -22,7 +23,7 @@ module ActiveAdmin
|
|
22
23
|
|
23
24
|
# Provide the AA translation to the blank input field.
|
24
25
|
def include_blank
|
25
|
-
I18n.t
|
26
|
+
I18n.t "active_admin.any" if super
|
26
27
|
end
|
27
28
|
|
28
29
|
def input_html_options_name
|
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
module ActiveAdmin
|
2
3
|
module Inputs
|
3
4
|
module Filters
|
@@ -5,7 +6,7 @@ module ActiveAdmin
|
|
5
6
|
include Base
|
6
7
|
include Base::SearchMethodSelect
|
7
8
|
|
8
|
-
filter :
|
9
|
+
filter :cont, :eq, :start, :end
|
9
10
|
|
10
11
|
# If the filter method includes a search condition, build a normal string search field.
|
11
12
|
# Else, build a search field with a companion dropdown to choose a search condition from.
|
data/lib/active_admin/inputs.rb
CHANGED