decidim-core 0.26.10 → 0.27.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of decidim-core might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/app/cells/decidim/amendable/announcement_cell.rb +4 -9
- data/app/cells/decidim/announcement_cell.rb +2 -2
- data/app/cells/decidim/author_cell.rb +1 -1
- data/app/cells/decidim/card_m_cell.rb +1 -1
- data/app/cells/decidim/collapsible_list/show.erb +1 -1
- data/app/cells/decidim/content_blocks/cta/show.erb +1 -1
- data/app/cells/decidim/content_blocks/cta_cell.rb +1 -1
- data/app/cells/decidim/content_blocks/footer_sub_hero/show.erb +1 -1
- data/app/cells/decidim/content_blocks/hero/show.erb +2 -2
- data/app/cells/decidim/content_blocks/highlighted_content_banner/show.erb +5 -5
- data/app/cells/decidim/content_blocks/highlighted_elements_cell.rb +1 -1
- data/app/cells/decidim/content_blocks/how_to_participate/show.erb +1 -1
- data/app/cells/decidim/content_blocks/last_activity/show.erb +1 -1
- data/app/cells/decidim/content_blocks/last_activity_cell.rb +3 -3
- data/app/cells/decidim/content_blocks/stats_cell.rb +4 -5
- data/app/cells/decidim/content_blocks/sub_hero/show.erb +1 -1
- data/app/cells/decidim/content_blocks/sub_hero_cell.rb +1 -1
- data/app/cells/decidim/data_consent/category.erb +64 -0
- data/app/cells/decidim/data_consent/dialog.erb +29 -0
- data/app/cells/decidim/data_consent/modal.erb +39 -0
- data/app/cells/decidim/data_consent/show.erb +3 -0
- data/app/cells/decidim/data_consent_cell.rb +21 -0
- data/app/cells/decidim/follow_button_cell.rb +5 -7
- data/app/cells/decidim/newsletter_templates/base_cell.rb +0 -8
- data/app/cells/decidim/newsletter_templates/basic_only_text/show.erb +4 -4
- data/app/cells/decidim/newsletter_templates/image_text_cta/show.erb +4 -4
- data/app/cells/decidim/profile_sidebar_cell.rb +1 -1
- data/app/cells/decidim/search_results_cell.rb +1 -1
- data/app/cells/decidim/tos_page/refuse_btn_modal.erb +1 -1
- data/app/cells/decidim/upload_modal/files.erb +52 -0
- data/app/cells/decidim/upload_modal/modal.erb +49 -0
- data/app/cells/decidim/upload_modal/show.erb +3 -0
- data/app/cells/decidim/upload_modal_cell.rb +205 -0
- data/app/cells/decidim/user_conversation/reply.erb +1 -1
- data/app/cells/decidim/user_conversations/add_conversation_users.erb +5 -3
- data/app/cells/decidim/version_cell.rb +3 -14
- data/app/cells/decidim/versions_list_cell.rb +3 -14
- data/app/cells/decidim/versions_list_item_cell.rb +2 -13
- data/app/commands/decidim/accept_group_invitation.rb +1 -1
- data/app/commands/decidim/accept_user_group_join_request.rb +1 -1
- data/app/commands/decidim/amendable/accept.rb +1 -1
- data/app/commands/decidim/amendable/create_draft.rb +1 -1
- data/app/commands/decidim/amendable/destroy_draft.rb +1 -1
- data/app/commands/decidim/amendable/promote.rb +1 -1
- data/app/commands/decidim/amendable/publish_draft.rb +1 -1
- data/app/commands/decidim/amendable/reject.rb +1 -1
- data/app/commands/decidim/amendable/update_draft.rb +1 -1
- data/app/commands/decidim/amendable/withdraw.rb +1 -1
- data/app/commands/decidim/attachment_methods.rb +3 -2
- data/app/commands/decidim/create_editor_image.rb +1 -1
- data/app/commands/decidim/create_follow.rb +1 -1
- data/app/commands/decidim/create_omniauth_registration.rb +2 -3
- data/app/commands/decidim/create_registration.rb +1 -2
- data/app/commands/decidim/create_report.rb +1 -1
- data/app/commands/decidim/create_user_group.rb +2 -2
- data/app/commands/decidim/create_user_report.rb +5 -3
- data/app/commands/decidim/delete_follow.rb +1 -1
- data/app/commands/decidim/demote_membership.rb +1 -1
- data/app/commands/decidim/destroy_account.rb +1 -1
- data/app/commands/decidim/endorse_resource.rb +1 -3
- data/app/commands/decidim/gallery_methods.rb +45 -10
- data/app/commands/decidim/invite_user.rb +1 -3
- data/app/commands/decidim/invite_user_again.rb +1 -1
- data/app/commands/decidim/invite_user_to_group.rb +1 -1
- data/app/commands/decidim/join_user_group.rb +1 -1
- data/app/commands/decidim/leave_user_group.rb +8 -2
- data/app/commands/decidim/messaging/reply_to_conversation.rb +2 -2
- data/app/commands/decidim/messaging/start_conversation.rb +2 -2
- data/app/commands/decidim/multiple_attachments_methods.rb +44 -5
- data/app/commands/decidim/promote_membership.rb +1 -1
- data/app/commands/decidim/reject_group_invitation.rb +1 -1
- data/app/commands/decidim/reject_user_group_join_request.rb +1 -1
- data/app/commands/decidim/remove_user_from_group.rb +1 -1
- data/app/commands/decidim/resend_confirmation_instructions.rb +18 -0
- data/app/commands/decidim/search.rb +10 -9
- data/app/commands/decidim/unendorse_resource.rb +2 -2
- data/app/commands/decidim/unsubscribe_settings.rb +1 -1
- data/app/commands/decidim/update_account.rb +2 -2
- data/app/commands/decidim/update_notifications_settings.rb +3 -2
- data/app/commands/decidim/update_password.rb +31 -0
- data/app/commands/decidim/update_user_group.rb +2 -2
- data/app/commands/decidim/update_user_interests.rb +1 -1
- data/app/commands/decidim/validate_upload.rb +15 -0
- data/app/controllers/concerns/decidim/devise_controllers.rb +0 -1
- data/app/controllers/concerns/decidim/filter_resource.rb +23 -24
- data/app/controllers/concerns/decidim/force_authentication.rb +1 -2
- data/app/controllers/concerns/decidim/http_caching_disabler.rb +1 -1
- data/app/controllers/concerns/decidim/needs_password_change.rb +43 -0
- data/app/controllers/concerns/decidim/needs_tos_accepted.rb +3 -3
- data/app/controllers/concerns/decidim/orderable.rb +1 -1
- data/app/controllers/concerns/decidim/participatory_space_context.rb +2 -2
- data/app/controllers/concerns/decidim/resource_versions_concern.rb +0 -4
- data/app/controllers/decidim/account_controller.rb +45 -0
- data/app/controllers/decidim/application_controller.rb +1 -1
- data/app/controllers/decidim/authorization_modals_controller.rb +1 -1
- data/app/controllers/decidim/devise/invitations_controller.rb +4 -9
- data/app/controllers/decidim/devise/passwords_controller.rb +33 -0
- data/app/controllers/decidim/devise/registrations_controller.rb +3 -5
- data/app/controllers/decidim/devise/sessions_controller.rb +2 -0
- data/app/controllers/decidim/{data_portability_controller.rb → download_your_data_controller.rb} +8 -8
- data/app/controllers/decidim/groups_controller.rb +5 -5
- data/app/controllers/decidim/last_activities_controller.rb +7 -9
- data/app/controllers/decidim/links_controller.rb +11 -10
- data/app/controllers/decidim/manifests_controller.rb +11 -0
- data/app/controllers/decidim/newsletters_controller.rb +1 -1
- data/app/controllers/decidim/notifications_subscriptions_controller.rb +16 -0
- data/app/controllers/decidim/offline_controller.rb +7 -0
- data/app/controllers/decidim/profiles_controller.rb +2 -2
- data/app/controllers/decidim/searches_controller.rb +4 -3
- data/app/controllers/decidim/short_links_controller.rb +35 -0
- data/app/controllers/decidim/upload_validations_controller.rb +44 -0
- data/app/controllers/decidim/user_activities_controller.rb +32 -16
- data/app/controllers/decidim/user_interests_controller.rb +0 -2
- data/app/controllers/decidim/user_timeline_controller.rb +7 -9
- data/app/events/decidim/change_nickname_event.rb +21 -0
- data/app/events/decidim/resource_endorsed_event.rb +1 -2
- data/app/forms/decidim/account_form.rb +4 -4
- data/app/forms/decidim/amendable/form.rb +1 -2
- data/app/forms/decidim/form.rb +1 -1
- data/app/forms/decidim/messaging/conversation_form.rb +1 -1
- data/app/forms/decidim/notifications_settings_form.rb +16 -2
- data/app/forms/decidim/password_form.rb +10 -0
- data/app/forms/decidim/registration_form.rb +3 -3
- data/app/forms/decidim/upload_validation_form.rb +54 -0
- data/app/forms/decidim/user_group_form.rb +1 -1
- data/app/forms/decidim/user_interest_scope_form.rb +1 -1
- data/app/forms/decidim/user_interests_form.rb +1 -1
- data/app/forms/translatable_presence_validator.rb +2 -2
- data/app/forms/url_validator.rb +1 -1
- data/app/helpers/decidim/application_helper.rb +2 -2
- data/app/helpers/decidim/attachments_helper.rb +1 -1
- data/app/helpers/decidim/cells_helper.rb +0 -1
- data/app/helpers/decidim/cells_paginate_helper.rb +1 -1
- data/app/helpers/decidim/datalist_select_helper.rb +40 -0
- data/app/helpers/decidim/decidim_form_helper.rb +1 -1
- data/app/helpers/decidim/external_domain_helper.rb +3 -14
- data/app/helpers/decidim/filters_helper.rb +1 -5
- data/app/helpers/decidim/followable_helper.rb +1 -1
- data/app/helpers/decidim/icon_helper.rb +4 -4
- data/app/helpers/decidim/layout_helper.rb +19 -16
- data/app/helpers/decidim/map_helper.rb +12 -8
- data/app/helpers/decidim/meta_tags_helper.rb +0 -2
- data/app/helpers/decidim/newsletters_helper.rb +0 -1
- data/app/helpers/decidim/notifications_settings_helper.rb +15 -0
- data/app/helpers/decidim/passwords_helper.rb +41 -0
- data/app/helpers/decidim/resource_helper.rb +0 -2
- data/app/helpers/decidim/sanitize_helper.rb +6 -15
- data/app/helpers/decidim/searches_helper.rb +6 -6
- data/app/helpers/decidim/short_link_helper.rb +28 -0
- data/app/helpers/decidim/translations_helper.rb +2 -2
- data/app/jobs/decidim/{data_portability_export_job.rb → download_your_data_export_job.rb} +5 -8
- data/app/jobs/decidim/email_notifications_digest_generator_job.rb +21 -0
- data/app/jobs/decidim/notification_generator_for_recipient_job.rb +5 -3
- data/app/jobs/decidim/open_data_job.rb +0 -2
- data/app/jobs/decidim/reminder_generator_job.rb +12 -0
- data/app/jobs/decidim/resend_confirmation_instructions_job.rb +11 -0
- data/app/jobs/decidim/user_report_job.rb +2 -2
- data/app/mailers/concerns/decidim/multitenant_asset_host.rb +11 -3
- data/app/mailers/decidim/application_mailer.rb +1 -1
- data/app/mailers/decidim/block_user_mailer.rb +8 -7
- data/app/mailers/decidim/export_mailer.rb +2 -2
- data/app/mailers/decidim/newsletter_mailer.rb +5 -12
- data/app/mailers/decidim/newsletters_opt_in_mailer.rb +7 -5
- data/app/mailers/decidim/notification_mailer.rb +0 -1
- data/app/mailers/decidim/notifications_digest_mailer.rb +23 -0
- data/app/mailers/decidim/user_report_mailer.rb +10 -11
- data/app/models/decidim/action_log.rb +95 -11
- data/app/models/decidim/amendment.rb +0 -1
- data/app/models/decidim/area.rb +1 -2
- data/app/models/decidim/area_type.rb +5 -0
- data/app/models/decidim/attachment.rb +6 -0
- data/app/models/decidim/attachment_collection.rb +5 -0
- data/app/models/decidim/category.rb +9 -4
- data/app/models/decidim/coauthorship.rb +0 -2
- data/app/models/decidim/contextual_help_section.rb +5 -1
- data/app/models/decidim/follow.rb +2 -2
- data/app/models/decidim/gamification/badge_score.rb +0 -1
- data/app/models/decidim/identity.rb +2 -2
- data/app/models/decidim/messaging/conversation.rb +4 -4
- data/app/models/decidim/messaging/message.rb +1 -2
- data/app/models/decidim/messaging/participation.rb +0 -2
- data/app/models/decidim/messaging/receipt.rb +0 -2
- data/app/models/decidim/newsletter.rb +0 -28
- data/app/models/decidim/notification.rb +5 -2
- data/app/models/decidim/oauth_application.rb +12 -1
- data/app/models/decidim/organization.rb +7 -13
- data/app/models/decidim/participatory_space_private_user.rb +4 -2
- data/app/models/decidim/permission_action.rb +1 -0
- data/app/models/decidim/reminder.rb +10 -0
- data/app/models/decidim/reminder_delivery.rb +7 -0
- data/app/models/decidim/reminder_record.rb +29 -0
- data/app/models/decidim/report.rb +2 -2
- data/app/models/decidim/scope.rb +3 -4
- data/app/models/decidim/scope_type.rb +1 -24
- data/app/models/decidim/share_token.rb +0 -2
- data/app/models/decidim/short_link.rb +162 -0
- data/app/models/decidim/user.rb +35 -13
- data/app/models/decidim/user_base_entity.rb +1 -4
- data/app/models/decidim/user_block.rb +2 -2
- data/app/models/decidim/user_group.rb +4 -4
- data/app/models/decidim/user_moderation.rb +0 -2
- data/app/models/decidim/user_report.rb +2 -2
- data/app/packs/entrypoints/decidim_core.js +2 -2
- data/app/packs/entrypoints/decidim_sw.js +1 -0
- data/app/packs/images/decidim/gamification/badges/decidim_gamification_badges_invitations.svg +1 -0
- data/app/packs/src/decidim/autocomplete.js +298 -0
- data/app/packs/src/decidim/cookie_consent/consent_manager.js +133 -0
- data/app/packs/src/decidim/cookie_consent/cookie_consent.js +103 -0
- data/app/packs/src/decidim/datalist_select.js +36 -0
- data/app/packs/src/decidim/direct_uploads/upload_field.js +117 -0
- data/app/packs/src/decidim/direct_uploads/upload_modal.js +264 -0
- data/app/packs/src/decidim/direct_uploads/upload_utility.js +49 -0
- data/app/packs/src/decidim/direct_uploads/uploader.js +89 -0
- data/app/packs/src/decidim/editor/linebreak_module.js +8 -0
- data/app/packs/src/decidim/editor.js +33 -70
- data/app/packs/src/decidim/external_domain_warning.js +1 -1
- data/app/packs/src/decidim/external_link.js +14 -3
- data/app/packs/src/decidim/external_link.test.js +64 -0
- data/app/packs/src/decidim/form_filter.component.test.js +5 -148
- data/app/packs/src/decidim/form_filter.js +4 -26
- data/app/packs/src/decidim/geocoding/attach_input.js +1 -4
- data/app/packs/src/decidim/geocoding/provider/here.js +21 -17
- data/app/packs/src/decidim/geocoding/provider/photon.js +1 -1
- data/app/packs/src/decidim/geocoding.js +10 -35
- data/app/packs/src/decidim/identity_selector_dialog.js +1 -1
- data/app/packs/src/decidim/impersonation.js +3 -3
- data/app/packs/src/decidim/input_character_counter.js +177 -7
- data/app/packs/src/decidim/input_multiple_mentions.js +87 -187
- data/app/packs/src/decidim/map/controller/drag_marker.js +2 -0
- data/app/packs/src/decidim/map/controller/markers.js +1 -0
- data/app/packs/src/decidim/map/controller/static.js +1 -0
- data/app/packs/src/decidim/map/controller.js +2 -0
- data/app/packs/src/decidim/map/factory.js +1 -4
- data/app/packs/src/decidim/map/icon.js +3 -1
- data/app/packs/src/decidim/map/legacy.js +1 -0
- data/app/packs/src/decidim/map/provider/default.js +0 -2
- data/app/packs/src/decidim/map/provider/here.js +1 -2
- data/app/packs/src/decidim/map/svg-icon.js +248 -0
- data/app/packs/src/decidim/security/selfxss_warning.js +5 -1
- data/app/packs/src/decidim/session_timeouter.js +15 -15
- data/app/packs/src/decidim/sw/a2hs.js +28 -0
- data/app/packs/src/decidim/sw/index.js +3 -0
- data/app/packs/src/decidim/sw/loader.js +18 -0
- data/app/packs/src/decidim/sw/push-permissions.js +87 -0
- data/app/packs/src/decidim/sw/sw.js +80 -0
- data/app/packs/src/decidim/vizzs/areachart.js +33 -28
- data/app/packs/src/decidim/vizzs/linechart.js +23 -18
- data/app/packs/src/decidim/vizzs/rowchart.js +15 -11
- data/app/packs/stylesheets/decidim/_editor.scss +0 -129
- data/app/packs/stylesheets/decidim/email.scss +66 -7
- data/app/packs/stylesheets/decidim/extras/_quill.scss +6 -0
- data/app/packs/stylesheets/decidim/layouts/_user.scss +8 -0
- data/app/packs/stylesheets/decidim/modules/_autocomplete.scss +99 -0
- data/app/packs/stylesheets/decidim/modules/_buttons.scss +6 -10
- data/app/packs/stylesheets/decidim/modules/_cards.scss +1 -3
- data/app/packs/stylesheets/decidim/modules/_comments.scss +0 -26
- data/app/packs/stylesheets/decidim/modules/_cookie-consent.scss +115 -0
- data/app/packs/stylesheets/decidim/modules/_footer.scss +4 -0
- data/app/packs/stylesheets/decidim/modules/_forms.scss +0 -5
- data/app/packs/stylesheets/decidim/modules/_input-multiple-mentions.scss +29 -2
- data/app/packs/stylesheets/decidim/modules/_modules.scss +3 -1
- data/app/packs/stylesheets/decidim/modules/_reveal.scss +15 -0
- data/app/packs/stylesheets/decidim/modules/_upload_modal.scss +143 -0
- data/app/packs/stylesheets/decidim/utils/_fontface.scss +3 -0
- data/app/packs/stylesheets/decidim/vizzs/_linechart.scss +2 -2
- data/app/packs/stylesheets/decidim/vizzs/_rowchart.scss +2 -2
- data/app/permissions/decidim/permissions.rb +4 -8
- data/app/presenters/decidim/admin_log/area_type_presenter.rb +34 -0
- data/app/presenters/decidim/admin_log/attachment_collection_presenter.rb +35 -0
- data/app/presenters/decidim/admin_log/attachment_presenter.rb +27 -0
- data/app/presenters/decidim/admin_log/category_presenter.rb +36 -0
- data/app/presenters/decidim/admin_log/component_presenter.rb +35 -3
- data/app/presenters/decidim/admin_log/contextual_help_section_presenter.rb +33 -0
- data/app/presenters/decidim/admin_log/organization_presenter.rb +9 -4
- data/app/presenters/decidim/admin_log/scope_type_presenter.rb +34 -0
- data/app/presenters/decidim/admin_log/user_group_presenter.rb +1 -1
- data/app/presenters/decidim/admin_log/user_moderation_presenter.rb +1 -1
- data/app/presenters/decidim/home_stats_presenter.rb +8 -13
- data/app/presenters/decidim/log/base_presenter.rb +1 -1
- data/app/presenters/decidim/menu_item_presenter.rb +1 -1
- data/app/presenters/decidim/metric_charts_presenter.rb +7 -1
- data/app/presenters/decidim/nil_presenter.rb +3 -1
- data/app/presenters/decidim/notification_presenter.rb +1 -1
- data/app/presenters/decidim/notification_to_mailer_presenter.rb +39 -0
- data/app/presenters/decidim/notifications_digest_presenter.rb +42 -0
- data/app/presenters/decidim/official_author_presenter.rb +4 -0
- data/app/presenters/decidim/organization_presenter.rb +22 -0
- data/app/presenters/decidim/push_notification_presenter.rb +24 -0
- data/app/presenters/decidim/stats_presenter.rb +9 -8
- data/app/presenters/decidim/user_group_presenter.rb +1 -1
- data/app/presenters/decidim/user_presenter.rb +5 -13
- data/app/presenters/decidim/validation_errors_presenter.rb +1 -1
- data/app/queries/decidim/messaging/user_conversations.rb +1 -1
- data/app/queries/decidim/metric_manage.rb +1 -1
- data/app/queries/decidim/metrics/users_metric_manage.rb +6 -6
- data/app/queries/decidim/own_activities.rb +11 -0
- data/app/queries/decidim/participatory_processes_with_user_role.rb +1 -1
- data/app/{services/decidim/activity_search.rb → queries/decidim/public_activities.rb} +35 -78
- data/app/queries/decidim/public_components.rb +1 -1
- data/app/queries/decidim/similar_emendations.rb +1 -1
- data/app/queries/decidim/stats_users_count.rb +1 -1
- data/app/queries/decidim/user_groups/accepted_memberships.rb +1 -1
- data/app/queries/decidim/user_groups/accepted_user_groups.rb +1 -1
- data/app/queries/decidim/user_groups/accepted_users.rb +1 -1
- data/app/queries/decidim/user_groups/admin_memberships.rb +1 -1
- data/app/queries/decidim/user_groups/invited_memberships.rb +1 -1
- data/app/queries/decidim/user_groups/manageable_user_groups.rb +1 -1
- data/app/queries/decidim/user_groups/member_memberships.rb +1 -1
- data/app/scrubbers/decidim/user_input_scrubber.rb +5 -32
- data/app/services/decidim/{data_portability_exporter.rb → download_your_data_exporter.rb} +6 -6
- data/app/services/decidim/email_notification_generator.rb +2 -2
- data/app/services/decidim/engine_resolver.rb +66 -0
- data/app/services/decidim/events_manager.rb +1 -1
- data/app/services/decidim/iframe_disabler.rb +31 -0
- data/app/services/decidim/notification_generator_for_recipient.rb +1 -1
- data/app/services/decidim/notifications_digest_sending_decider.rb +18 -0
- data/app/services/decidim/notifications_subscriptions_persistor.rb +37 -0
- data/app/services/decidim/open_data_exporter.rb +1 -1
- data/app/services/decidim/resource_search.rb +17 -164
- data/app/services/decidim/send_push_notification.rb +59 -0
- data/app/services/decidim/traceability.rb +1 -2
- data/app/uploaders/decidim/application_uploader.rb +2 -12
- data/app/uploaders/decidim/cw/attachment_uploader.rb +1 -1
- data/app/uploaders/decidim/cw/{data_portability_uploader.rb → download_your_data_uploader.rb} +3 -3
- data/app/uploaders/decidim/cw/image_uploader.rb +2 -2
- data/app/uploaders/decidim/organization_favicon_uploader.rb +3 -2
- data/app/validators/etiquette_validator.rb +3 -7
- data/app/validators/passthru_validator.rb +29 -21
- data/app/validators/password_validator.rb +25 -4
- data/app/validators/uploader_image_dimensions_validator.rb +1 -1
- data/app/views/decidim/account/_account_notification.js.erb +20 -0
- data/app/views/decidim/account/_password_fields.html.erb +2 -2
- data/app/views/decidim/account/cancel_email_change.js.erb +6 -0
- data/app/views/decidim/account/resend_confirmation_instructions.erb +1 -0
- data/app/views/decidim/account/show.html.erb +19 -6
- data/app/views/decidim/application/{_attachments.html.erb → _attachments.erb} +2 -2
- data/app/views/decidim/application/_collection.html.erb +1 -1
- data/app/views/decidim/application/{_documents.html.erb → _documents.erb} +2 -2
- data/app/views/decidim/devise/confirmations/new.html.erb +1 -1
- data/app/views/decidim/devise/invitations/edit.html.erb +3 -4
- data/app/views/decidim/devise/omniauth_registrations/new.html.erb +3 -3
- data/app/views/decidim/devise/passwords/edit.html.erb +7 -5
- data/app/views/decidim/devise/passwords/new.html.erb +1 -1
- data/app/views/decidim/devise/registrations/edit.html.erb +41 -0
- data/app/views/decidim/devise/registrations/new.html.erb +5 -5
- data/app/views/decidim/devise/sessions/new.html.erb +2 -2
- data/app/views/decidim/{data_portability → download_your_data}/show.html.erb +2 -2
- data/app/views/decidim/export_mailer/download_your_data_export.html.erb +7 -0
- data/app/views/decidim/last_activities/index.html.erb +1 -1
- data/app/views/decidim/links/_modal.html.erb +1 -1
- data/app/views/decidim/links/new.html.erb +1 -1
- data/app/views/decidim/manifests/show.json.erb +31 -0
- data/app/views/decidim/messaging/conversations/_add_conversation_users.html.erb +5 -3
- data/app/views/decidim/messaging/conversations/_conversation.html.erb +5 -1
- data/app/views/decidim/messaging/conversations/_reply.html.erb +1 -1
- data/app/views/decidim/messaging/conversations/_start.html.erb +1 -3
- data/app/views/decidim/messaging/conversations/create.js.erb +1 -0
- data/app/views/decidim/newsletter_mailer/newsletter.html.erb +3 -3
- data/app/views/decidim/newsletters/show.html.erb +1 -1
- data/app/views/decidim/notification_mailer/event_received.html.erb +1 -1
- data/app/views/decidim/notifications_digest_mailer/_email_content.html.erb +11 -0
- data/app/views/decidim/notifications_digest_mailer/digest_mail.erb +27 -0
- data/app/views/decidim/notifications_settings/show.html.erb +79 -52
- data/app/views/decidim/offline/show.html.erb +9 -0
- data/app/views/decidim/pages/_standalone.html.erb +1 -1
- data/app/views/decidim/pages/_tabbed.html.erb +1 -1
- data/app/views/decidim/reported_mailer/hide.html.erb +1 -1
- data/app/views/decidim/reported_mailer/report.html.erb +1 -1
- data/app/views/decidim/scopes/picker.html.erb +1 -1
- data/app/views/decidim/searches/_filters.html.erb +2 -2
- data/app/views/decidim/shared/participatory_space_filters/_filters.html.erb +3 -3
- data/app/views/decidim/user_interests/show.html.erb +13 -11
- data/app/views/decidim/user_report_mailer/notify.html.erb +10 -3
- data/app/views/devise/mailer/confirmation_instructions.html.erb +3 -1
- data/app/views/layouts/decidim/_application.html.erb +6 -3
- data/app/views/layouts/decidim/_cookie_warning.html.erb +8 -8
- data/app/views/layouts/decidim/_decidim_javascript.html.erb +12 -0
- data/app/views/layouts/decidim/_head.html.erb +4 -2
- data/app/views/layouts/decidim/_js_configuration.html.erb +5 -1
- data/app/views/layouts/decidim/_mailer_logo.html.erb +2 -2
- data/app/views/layouts/decidim/_main_footer.html.erb +1 -0
- data/app/views/layouts/decidim/_offline_banner.html.erb +11 -0
- data/app/views/layouts/decidim/newsletter_base.html.erb +2 -2
- data/app/views/layouts/decidim/widget.html.erb +2 -2
- data/config/assets.rb +1 -0
- data/config/locales/am-ET.yml +1 -0
- data/config/locales/ar.yml +86 -461
- data/config/locales/bg.yml +57 -32
- data/config/locales/ca.yml +246 -85
- data/config/locales/cs.yml +256 -97
- data/config/locales/da.yml +1 -3
- data/config/locales/de.yml +93 -159
- data/config/locales/el.yml +53 -137
- data/config/locales/en.yml +220 -59
- data/config/locales/eo.yml +8 -13
- data/config/locales/es-MX.yml +234 -73
- data/config/locales/es-PY.yml +236 -75
- data/config/locales/es.yml +244 -83
- data/config/locales/et.yml +1 -3
- data/config/locales/eu.yml +416 -479
- data/config/locales/fi-plain.yml +222 -61
- data/config/locales/fi.yml +236 -75
- data/config/locales/fr-CA.yml +218 -71
- data/config/locales/fr.yml +224 -77
- data/config/locales/ga-IE.yml +15 -9
- data/config/locales/gl.yml +112 -35
- data/config/locales/hr.yml +1 -3
- data/config/locales/hu.yml +106 -266
- data/config/locales/id-ID.yml +61 -35
- data/config/locales/is-IS.yml +12 -23
- data/config/locales/it.yml +66 -41
- data/config/locales/ja.yml +235 -83
- data/config/locales/ko.yml +1 -0
- data/config/locales/lb.yml +57 -38
- data/config/locales/lt.yml +1 -1788
- data/config/locales/lv.yml +55 -28
- data/config/locales/mt.yml +1 -0
- data/config/locales/nl.yml +81 -39
- data/config/locales/no.yml +84 -41
- data/config/locales/om-ET.yml +1 -0
- data/config/locales/pl.yml +127 -46
- data/config/locales/pt-BR.yml +52 -80
- data/config/locales/pt.yml +54 -35
- data/config/locales/ro-RO.yml +55 -43
- data/config/locales/ru.yml +35 -29
- data/config/locales/si-LK.yml +1 -0
- data/config/locales/sk.yml +62 -45
- data/config/locales/sl.yml +6 -1
- data/config/locales/so-SO.yml +1 -0
- data/config/locales/sr-CS.yml +1 -10
- data/config/locales/sv.yml +127 -55
- data/config/locales/sw-KE.yml +1 -0
- data/config/locales/ti-ER.yml +1 -0
- data/config/locales/tr-TR.yml +55 -40
- data/config/locales/uk.yml +30 -30
- data/config/locales/val-ES.yml +1 -0
- data/config/locales/vi.yml +1 -0
- data/config/locales/zh-CN.yml +53 -33
- data/config/locales/zh-TW.yml +1 -1721
- data/config/routes.rb +19 -22
- data/db/migrate/20180508111710_add_accepted_tos_version_field_to_users.rb +1 -0
- data/db/migrate/20181030090144_destroy_deleted_users_follows.rb +2 -1
- data/db/migrate/20181204110723_remove_following_users_count_from_users.rb +2 -11
- data/db/migrate/20181214101250_add_notification_types_to_users.rb +1 -6
- data/db/migrate/20190412131728_fix_user_names.rb +2 -9
- data/db/migrate/20200211173227_add_direct_message_types_to_users.rb +1 -6
- data/db/migrate/20210302150803_invalidate_all_sessions_for_deleted_users.rb +3 -10
- data/db/migrate/20210310120640_add_followable_counter_cache_to_users.rb +3 -13
- data/db/migrate/20210831181634_add_service_name_to_active_storage_blobs.active_storage.rb +22 -0
- data/db/migrate/20210831181635_create_active_storage_variant_records.active_storage.rb +14 -0
- data/db/migrate/20211208155453_create_decidim_reminders.rb +11 -0
- data/db/migrate/20211209121025_create_decidim_reminder_records.rb +11 -0
- data/db/migrate/20211209121040_create_decidim_reminder_deliveries.rb +10 -0
- data/db/migrate/20220118121921_change_required_description_categories.rb +7 -0
- data/db/migrate/20220127113419_add_notification_settings_to_users.rb +7 -0
- data/db/migrate/20220203121137_add_notifications_sending_frequency_to_users.rb +7 -0
- data/db/migrate/20220215172439_add_digest_sent_at_to_users.rb +7 -0
- data/db/migrate/20220323195258_add_index_to_decidim_users_notifications_sending_frequency.rb +7 -0
- data/db/migrate/20220427142214_drop_emails_on_notifications_flag_from_user.rb +15 -0
- data/db/migrate/20220518094535_add_previous_passwords_to_users.rb +20 -0
- data/db/migrate/20220524195530_create_decidim_short_links.rb +23 -0
- data/db/seeds.rb +17 -19
- data/lib/decidim/acts_as_tree.rb +47 -0
- data/lib/decidim/api/input_sorts/component_input_sort.rb +2 -1
- data/lib/decidim/api/interfaces/authorable_interface.rb +6 -5
- data/lib/decidim/api/types/localized_string_type.rb +0 -9
- data/lib/decidim/api/types/translated_field_type.rb +5 -20
- data/lib/decidim/asset_router.rb +80 -0
- data/lib/decidim/attachment_attributes.rb +8 -8
- data/lib/decidim/attribute_object/form.rb +174 -0
- data/lib/decidim/attribute_object/model.rb +148 -0
- data/lib/decidim/attribute_object/nested_validator.rb +22 -0
- data/lib/decidim/attribute_object/type_map.rb +14 -0
- data/lib/decidim/attribute_object/type_resolver.rb +91 -0
- data/lib/decidim/attribute_object.rb +26 -0
- data/lib/decidim/attributes/array.rb +62 -0
- data/lib/decidim/attributes/blob.rb +20 -0
- data/lib/decidim/attributes/clean_string.rb +12 -6
- data/lib/decidim/attributes/hash.rb +36 -0
- data/lib/decidim/attributes/integer.rb +17 -0
- data/lib/decidim/attributes/localized_date.rb +8 -14
- data/lib/decidim/attributes/model.rb +24 -0
- data/lib/decidim/attributes/object.rb +28 -0
- data/lib/decidim/attributes/symbol.rb +23 -0
- data/lib/decidim/attributes/time_with_zone.rb +7 -17
- data/lib/decidim/attributes.rb +29 -0
- data/lib/decidim/authorable.rb +21 -6
- data/lib/decidim/authorization_form_builder.rb +9 -11
- data/lib/decidim/carrier_wave_migrator_service.rb +15 -15
- data/lib/decidim/coauthorable.rb +22 -4
- data/lib/decidim/command.rb +44 -0
- data/lib/decidim/common_passwords.rb +1 -1
- data/lib/decidim/component_manifest.rb +5 -5
- data/lib/decidim/component_validator.rb +2 -2
- data/lib/decidim/content_block_manifest.rb +1 -1
- data/lib/decidim/content_parsers/hashtag_parser.rb +2 -2
- data/lib/decidim/content_parsers/resource_parser.rb +1 -1
- data/lib/decidim/content_parsers/user_group_parser.rb +1 -1
- data/lib/decidim/content_parsers/user_parser.rb +4 -4
- data/lib/decidim/content_renderers/hashtag_renderer.rb +1 -1
- data/lib/decidim/content_renderers/link_renderer.rb +2 -2
- data/lib/decidim/content_renderers/user_group_renderer.rb +1 -1
- data/lib/decidim/content_renderers/user_renderer.rb +1 -1
- data/lib/decidim/controller_helpers.rb +41 -0
- data/lib/decidim/core/engine.rb +35 -19
- data/lib/decidim/core/test/factories.rb +54 -21
- data/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb +16 -4
- data/lib/decidim/core/test/shared_examples/amendable/amendment_form_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/authorable_interface_examples.rb +15 -2
- data/lib/decidim/core/test/shared_examples/coauthorable_interface_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/comments_examples.rb +203 -60
- data/lib/decidim/core/test/shared_examples/errors.rb +0 -2
- data/lib/decidim/core/test/shared_examples/localised_email.rb +1 -1
- data/lib/decidim/core/test/shared_examples/logo_email.rb +1 -1
- data/lib/decidim/core/test/shared_examples/map_examples.rb +3 -6
- data/lib/decidim/core/test/shared_examples/preview_component_with_share_token_examples.rb +0 -6
- data/lib/decidim/core/test/shared_examples/resource_search_examples.rb +120 -40
- data/lib/decidim/core/test/shared_examples/resourceable.rb +0 -6
- data/lib/decidim/core/test/shared_examples/rich_text_editor_examples.rb +3 -7
- data/lib/decidim/core/test/shared_examples/searchable_participatory_space_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/searchable_resources_shared_context.rb +1 -1
- data/lib/decidim/core/test/shared_examples/system_endorse_resource_examples.rb +3 -3
- data/lib/decidim/core/test/shared_examples/translated_event_examples.rb +2 -2
- data/lib/decidim/core/test/shared_examples/with_endorsable_permissions_examples.rb +1 -1
- data/lib/decidim/core/test.rb +0 -4
- data/lib/decidim/core/version.rb +1 -1
- data/lib/decidim/core.rb +106 -55
- data/lib/decidim/{data_portability.rb → download_your_data.rb} +3 -3
- data/lib/decidim/{data_portability_serializers/data_portability_conversation_serializer.rb → download_your_data_serializers/download_your_data_conversation_serializer.rb} +2 -2
- data/lib/decidim/{data_portability_serializers/data_portability_follow_serializer.rb → download_your_data_serializers/download_your_data_follow_serializer.rb} +2 -2
- data/lib/decidim/{data_portability_serializers/data_portability_identity_serializer.rb → download_your_data_serializers/download_your_data_identity_serializer.rb} +2 -2
- data/lib/decidim/{data_portability_serializers/data_portability_notification_serializer.rb → download_your_data_serializers/download_your_data_notification_serializer.rb} +2 -2
- data/lib/decidim/{data_portability_serializers/data_portability_participatory_space_private_user_serializer.rb → download_your_data_serializers/download_your_data_participatory_space_private_user_serializer.rb} +2 -2
- data/lib/decidim/{data_portability_serializers/data_portability_report_serializer.rb → download_your_data_serializers/download_your_data_report_serializer.rb} +2 -2
- data/lib/decidim/{data_portability_serializers/data_portability_user_group_serializer.rb → download_your_data_serializers/download_your_data_user_group_serializer.rb} +2 -2
- data/lib/decidim/{data_portability_serializers/data_portability_user_serializer.rb → download_your_data_serializers/download_your_data_user_serializer.rb} +3 -3
- data/lib/decidim/download_your_data_serializers.rb +23 -0
- data/lib/decidim/endorsable.rb +1 -1
- data/lib/decidim/engine_router.rb +7 -1
- data/lib/decidim/env.rb +56 -0
- data/lib/decidim/event_recorder.rb +25 -0
- data/lib/decidim/events/base_event.rb +10 -14
- data/lib/decidim/events/simple_event.rb +6 -5
- data/lib/decidim/exporters/export_data.rb +1 -1
- data/lib/decidim/exporters/export_manifest.rb +2 -1
- data/lib/decidim/exporters.rb +1 -10
- data/lib/decidim/file_validator_humanizer.rb +24 -1
- data/lib/decidim/filterable_resource.rb +55 -0
- data/lib/decidim/fingerprint_calculator.rb +2 -4
- data/lib/decidim/form_builder.rb +174 -145
- data/lib/decidim/gamification/badge.rb +2 -3
- data/lib/decidim/gamification/badge_scorer.rb +1 -0
- data/lib/decidim/has_area.rb +27 -0
- data/lib/decidim/has_attachments.rb +2 -2
- data/lib/decidim/has_category.rb +36 -0
- data/lib/decidim/has_resource_permission.rb +2 -0
- data/lib/decidim/importers/import_manifest.rb +3 -21
- data/lib/decidim/jsonb_attributes.rb +6 -4
- data/lib/decidim/manifest_messages.rb +23 -0
- data/lib/decidim/map/autocomplete.rb +6 -4
- data/lib/decidim/map/frontend.rb +2 -2
- data/lib/decidim/map/provider/dynamic_map/here.rb +1 -46
- data/lib/decidim/map/provider/geocoding/here.rb +5 -5
- data/lib/decidim/map/provider/here.rb +3 -0
- data/lib/decidim/map/provider/osm.rb +3 -0
- data/lib/decidim/map.rb +4 -4
- data/lib/decidim/menu.rb +1 -1
- data/lib/decidim/metric_manifest.rb +2 -2
- data/lib/decidim/nicknamizable.rb +1 -1
- data/lib/decidim/notification_setting_manifest.rb +19 -0
- data/lib/decidim/organization_settings.rb +8 -7
- data/lib/decidim/participatory_space_context_manifest.rb +2 -2
- data/lib/decidim/participatory_space_manifest.rb +2 -2
- data/lib/decidim/participatory_space_resourceable.rb +1 -7
- data/lib/decidim/processes_file_locally.rb +31 -0
- data/lib/decidim/publicable.rb +0 -4
- data/lib/decidim/query.rb +84 -0
- data/lib/decidim/record_encryptor.rb +29 -8
- data/lib/decidim/reminder_manifest.rb +75 -0
- data/lib/decidim/reminder_registry.rb +67 -0
- data/lib/decidim/resource_manifest.rb +1 -1
- data/lib/decidim/resourceable.rb +15 -5
- data/lib/decidim/scopable.rb +15 -0
- data/lib/decidim/settings_manifest.rb +4 -4
- data/lib/decidim/spring.rb +16 -0
- data/lib/decidim/translatable_attributes.rb +13 -16
- data/lib/decidim/url_option_resolver.rb +50 -0
- data/lib/decidim/view_hooks.rb +1 -1
- data/lib/decidim/view_model.rb +5 -1
- data/lib/decidim/webpacker/thread_safe_compiler.rb +30 -0
- data/lib/decidim/webpacker/webpack/custom.js +15 -3
- data/lib/decidim/webpacker/webpacker.yml +1 -1
- data/lib/decidim/webpacker.rb +2 -0
- data/lib/devise/models/decidim_validatable.rb +1 -1
- data/lib/tasks/decidim_active_storage_migration_tasks.rake +1 -3
- data/lib/tasks/{decidim_data_portability_tasks.rake → decidim_download_your_data_tasks.rake} +9 -9
- data/lib/tasks/decidim_mailers_tasks.rake +23 -0
- data/lib/tasks/decidim_metrics_tasks.rake +1 -1
- data/lib/tasks/decidim_pwa_tasks.rake +18 -0
- data/lib/tasks/decidim_reminders_tasks.rake +17 -0
- data/lib/tasks/decidim_tasks.rake +6 -1
- data/lib/tasks/decidim_webpacker_tasks.rake +1 -1
- data/lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake +51 -0
- metadata +186 -105
- data/app/controllers/decidim/cookie_policy_controller.rb +0 -24
- data/app/helpers/decidim/cookies_helper.rb +0 -11
- data/app/packs/src/decidim/editor/clipboard_override.js +0 -147
- data/app/packs/src/decidim/editor/clipboard_utilities.js +0 -119
- data/app/packs/src/decidim/vizzs/renders.js +0 -9
- data/app/packs/src/decidim/vizzs.js +0 -1
- data/app/packs/stylesheets/decidim/modules/_cookie-bar.scss +0 -26
- data/app/scrubbers/decidim/admin_input_scrubber.rb +0 -27
- data/app/services/decidim/home_activity_search.rb +0 -80
- data/app/services/decidim/participatory_space_search.rb +0 -54
- data/app/views/decidim/cookie_policy/accept.js.erb +0 -3
- data/app/views/decidim/export_mailer/data_portability_export.html.erb +0 -7
- data/app/views/decidim/links/_invalid_url_modal.html.erb +0 -17
- data/app/views/decidim/links/invalid_url.js.erb +0 -24
- data/config/environment.rb +0 -3
- data/config/locales/fa-IR.yml +0 -1
- data/config/locales/gn-PY.yml +0 -4
- data/config/locales/ka-GE.yml +0 -4
- data/config/locales/kaa.yml +0 -5
- data/config/locales/lo-LA.yml +0 -1
- data/config/locales/oc-FR.yml +0 -3
- data/config/locales/sq-AL.yml +0 -1
- data/config/locales/th-TH.yml +0 -1
- data/db/migrate/20231027142329_change_default_value_for_decidim_endorsements.rb +0 -11
- data/lib/decidim/core/test/shared_examples/editor_shared_examples.rb +0 -10
- data/lib/decidim/core/test/shared_examples/mcell_examples.rb +0 -17
- data/lib/decidim/core/test/shared_examples/resource_endorsed_event_examples.rb +0 -60
- data/lib/decidim/core/test/shared_examples/versions_controller_examples.rb +0 -40
- data/lib/decidim/data_portability_serializers.rb +0 -23
- data/lib/decidim/dependency_resolver.rb +0 -278
- data/lib/decidim/middleware/rails_cookies.rb +0 -23
- data/lib/tasks/upgrade/decidim_deduplicate_endorsements.rake +0 -53
- data/lib/tasks/upgrade/decidim_user_moderation.rake +0 -14
- /data/app/packs/src/decidim/vizzs/{metrics.js → index.js} +0 -0
- /data/app/views/decidim/application/{_document.html.erb → _document.erb} +0 -0
- /data/app/views/decidim/application/{_photos.html.erb → _photos.erb} +0 -0
- /data/app/views/decidim/{data_portability → download_your_data}/export.html.erb +0 -0
data/lib/decidim/exporters.rb
CHANGED
@@ -9,11 +9,6 @@ module Decidim
|
|
9
9
|
autoload :PDF, "decidim/exporters/pdf"
|
10
10
|
autoload :ExportData, "decidim/exporters/export_data"
|
11
11
|
|
12
|
-
# Lock the export formats to one of the available exporters
|
13
|
-
EXPORT_FORMATS = [:JSON, :CSV, :Excel, :PDF, :FormPDF].freeze
|
14
|
-
|
15
|
-
class UnknownFormatError < StandardError; end
|
16
|
-
|
17
12
|
# Necessary for the i18n normalizer to locate strings not directly invoked in views:
|
18
13
|
|
19
14
|
# i18n-tasks-use t('decidim.admin.exports.formats.JSON')
|
@@ -24,11 +19,7 @@ module Decidim
|
|
24
19
|
#
|
25
20
|
# format - The exporter format as a string. i.e "CSV"
|
26
21
|
def self.find_exporter(format)
|
27
|
-
|
28
|
-
raise UnknownFormatError unless EXPORT_FORMATS.include?(format.to_sym)
|
29
|
-
raise UnknownFormatError unless const_defined?(format.to_sym)
|
30
|
-
|
31
|
-
const_get(format.to_sym)
|
22
|
+
const_get(format)
|
32
23
|
end
|
33
24
|
end
|
34
25
|
end
|
@@ -12,6 +12,8 @@ module Decidim
|
|
12
12
|
# another object in case the PassthruValidator is in charge of the
|
13
13
|
# validations.
|
14
14
|
class FileValidatorHumanizer
|
15
|
+
# record - Form object (e.g. Decidim::AccountForm)
|
16
|
+
# attribute - Form field (e.g. :avatar)
|
15
17
|
def initialize(record, attribute)
|
16
18
|
@record = record
|
17
19
|
@attribute = attribute
|
@@ -21,7 +23,7 @@ module Decidim
|
|
21
23
|
end
|
22
24
|
|
23
25
|
def uploader
|
24
|
-
@uploader ||=
|
26
|
+
@uploader ||= fetch_uploader
|
25
27
|
end
|
26
28
|
|
27
29
|
def messages
|
@@ -36,6 +38,14 @@ module Decidim
|
|
36
38
|
)
|
37
39
|
end
|
38
40
|
|
41
|
+
if (file_dimensions = max_file_dimensions)
|
42
|
+
messages << I18n.t(
|
43
|
+
"max_file_dimension",
|
44
|
+
resolution: file_dimensions,
|
45
|
+
scope: "decidim.forms.file_validation"
|
46
|
+
)
|
47
|
+
end
|
48
|
+
|
39
49
|
if (extensions = extension_allowlist)
|
40
50
|
messages << I18n.t(
|
41
51
|
"allowed_file_extensions",
|
@@ -73,6 +83,12 @@ module Decidim
|
|
73
83
|
end
|
74
84
|
# rubocop: enable Metrics/CyclomaticComplexity
|
75
85
|
|
86
|
+
def max_file_dimensions
|
87
|
+
return unless uploader.respond_to?(:max_image_height_or_width)
|
88
|
+
|
89
|
+
"#{uploader.max_image_height_or_width}x#{uploader.max_image_height_or_width}"
|
90
|
+
end
|
91
|
+
|
76
92
|
def extension_allowlist
|
77
93
|
return unless uploader.respond_to?(:extension_allowlist, true)
|
78
94
|
|
@@ -85,6 +101,13 @@ module Decidim
|
|
85
101
|
|
86
102
|
attr_reader :record, :attribute, :passthru_validator
|
87
103
|
|
104
|
+
def fetch_uploader
|
105
|
+
return passthru_uploader if passthru_uploader.present?
|
106
|
+
return record.attached_uploader(attribute) if record.respond_to?(:attached_uploader) && record.attached_uploader(attribute).present?
|
107
|
+
|
108
|
+
record.send(attribute)
|
109
|
+
end
|
110
|
+
|
88
111
|
def passthru_record
|
89
112
|
return unless passthru_validator
|
90
113
|
|
@@ -0,0 +1,55 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
# A concern that adds extra search helpers for the models for Ransack
|
5
|
+
# searches.
|
6
|
+
module FilterableResource
|
7
|
+
extend ActiveSupport::Concern
|
8
|
+
|
9
|
+
class_methods do
|
10
|
+
def ransacker_i18n(field_name, attr_name = nil)
|
11
|
+
ransacker field_name do |parent|
|
12
|
+
Arel::Nodes::InfixOperation.new("->>", parent.table[attr_name || field_name], Arel::Nodes.build_quoted(I18n.locale.to_s))
|
13
|
+
end
|
14
|
+
end
|
15
|
+
|
16
|
+
def ransacker_i18n_multi(field_name, attrs)
|
17
|
+
raise "The second argument needs to be an array" unless attrs.is_a?(Array)
|
18
|
+
raise "You need to define at least one field in the second argument" if attrs.count < 1
|
19
|
+
return ransacker_i18n(field_name, attrs.first) if attrs.count < 2
|
20
|
+
|
21
|
+
# Create an i18n ransacker search for each of the provided attributes.
|
22
|
+
attrs.each { |attr_name| ransacker_i18n(attr_name) }
|
23
|
+
|
24
|
+
# Create the field name search alias for the attributes
|
25
|
+
ransacker_text_multi(field_name, attrs)
|
26
|
+
end
|
27
|
+
|
28
|
+
def ransacker_text_multi(field_name, attrs)
|
29
|
+
raise "The second argument needs to be an array" unless attrs.is_a?(Array)
|
30
|
+
raise "You need to define at least two fields in the second argument" if attrs.count < 1
|
31
|
+
|
32
|
+
# Alias the field_name as an OR query with all the provided fields.
|
33
|
+
ransack_alias field_name, attrs.join("_or_").to_sym
|
34
|
+
end
|
35
|
+
|
36
|
+
def scope_search_multi(scope_key, possible_scopes)
|
37
|
+
scope scope_key, lambda { |*value_keys|
|
38
|
+
search_values = value_keys.compact.compact_blank
|
39
|
+
|
40
|
+
conditions = possible_scopes.map do |scope|
|
41
|
+
search_values.member?(scope.to_s) ? try(scope) : nil
|
42
|
+
end.compact
|
43
|
+
return self unless conditions.any?
|
44
|
+
|
45
|
+
scoped_query = where(id: conditions.shift)
|
46
|
+
conditions.each do |condition|
|
47
|
+
scoped_query = scoped_query.or(where(id: condition))
|
48
|
+
end
|
49
|
+
|
50
|
+
scoped_query
|
51
|
+
}
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
@@ -33,10 +33,8 @@ module Decidim
|
|
33
33
|
def sort_hash(hash)
|
34
34
|
return hash unless hash.is_a?(Hash)
|
35
35
|
|
36
|
-
|
37
|
-
|
38
|
-
.sort_by { |key, _value| key }
|
39
|
-
]
|
36
|
+
hash.map { |key, value| [key, sort_hash(value)] }
|
37
|
+
.sort_by { |key, _value| key }.to_h
|
40
38
|
end
|
41
39
|
end
|
42
40
|
end
|
data/lib/decidim/form_builder.rb
CHANGED
@@ -47,7 +47,7 @@ module Decidim
|
|
47
47
|
# rubocop:enable Metrics/ParameterLists
|
48
48
|
|
49
49
|
def create_language_selector(locales, tabs_id, name)
|
50
|
-
if
|
50
|
+
if Decidim.available_locales.count > 4
|
51
51
|
language_selector_select(locales, tabs_id, name)
|
52
52
|
else
|
53
53
|
language_tabs(locales, tabs_id, name)
|
@@ -67,7 +67,7 @@ module Decidim
|
|
67
67
|
tabs_id = sanitize_tabs_selector(options[:tabs_id] || "#{object_name}-#{name}-tabs")
|
68
68
|
|
69
69
|
label_tabs = content_tag(:div, class: "label--tabs") do
|
70
|
-
field_label = label_i18n(name, options[:label] || label_for(name))
|
70
|
+
field_label = label_i18n(name, options[:label] || label_for(name), required: options[:required])
|
71
71
|
|
72
72
|
language_selector = "".html_safe
|
73
73
|
language_selector = create_language_selector(locales, tabs_id, name) if options[:label] != false
|
@@ -94,6 +94,13 @@ module Decidim
|
|
94
94
|
safe_join [label_tabs, tabs_content]
|
95
95
|
end
|
96
96
|
|
97
|
+
def password_field(attribute, options = {})
|
98
|
+
field attribute, options do |opts|
|
99
|
+
opts[:autocomplete] ||= :off
|
100
|
+
method(__method__).super_method.super_method.call(attribute, opts)
|
101
|
+
end
|
102
|
+
end
|
103
|
+
|
97
104
|
def translated_one_locale(type, name, locale, options = {})
|
98
105
|
return hashtaggable_text_field(type, name, locale, options) if options.delete(:hashtaggable)
|
99
106
|
|
@@ -135,7 +142,7 @@ module Decidim
|
|
135
142
|
tabs_id = sanitize_tabs_selector(options[:tabs_id] || "#{object_name}-#{name}-tabs")
|
136
143
|
|
137
144
|
label_tabs = content_tag(:div, class: "label--tabs") do
|
138
|
-
field_label = label_i18n(name, options[:label] || label_for(name))
|
145
|
+
field_label = label_i18n(name, options[:label] || label_for(name), required: options[:required])
|
139
146
|
|
140
147
|
tabs_panels = "".html_safe
|
141
148
|
if options[:label] != false
|
@@ -174,6 +181,7 @@ module Decidim
|
|
174
181
|
# or 'full' (optional) (default: 'basic')
|
175
182
|
# :lines - The Integer to indicate how many lines should editor have (optional) (default: 10)
|
176
183
|
# :disabled - Whether the editor should be disabled
|
184
|
+
# :editor_images - Allow attached images (optional) (default: false)
|
177
185
|
#
|
178
186
|
# Renders a container with both hidden field and editor container
|
179
187
|
def editor(name, options = {})
|
@@ -191,12 +199,9 @@ module Decidim
|
|
191
199
|
template += label(name, label_text + required_for_attribute(name)) if options.fetch(:label, true)
|
192
200
|
template += hidden_field(name, hidden_options)
|
193
201
|
template += content_tag(:div, nil, class: "editor-container #{"js-hashtags" if hashtaggable}", data: {
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
upload_images_path: Decidim::Core::Engine.routes.url_helpers.editor_images_path,
|
198
|
-
drag_and_drop_help_text: I18n.t("drag_and_drop_help", scope: "decidim.editor_images")
|
199
|
-
}, style: "height: #{lines}rem")
|
202
|
+
toolbar: toolbar,
|
203
|
+
disabled: options[:disabled]
|
204
|
+
}.merge(editor_images_options(options)), style: "height: #{lines}rem")
|
200
205
|
template += error_for(name, options) if error?(name)
|
201
206
|
template.html_safe
|
202
207
|
end
|
@@ -382,14 +387,7 @@ module Decidim
|
|
382
387
|
def datetime_field(attribute, options = {})
|
383
388
|
value = object.send(attribute)
|
384
389
|
data = { datepicker: "", timepicker: "" }
|
385
|
-
if value.present?
|
386
|
-
case value
|
387
|
-
when ActiveSupport::TimeWithZone
|
388
|
-
data[:startdate] = I18n.l(value, format: :decidim_short)
|
389
|
-
when Time, DateTime
|
390
|
-
data[:startdate] = I18n.l(value.in_time_zone(Time.zone), format: :decidim_short)
|
391
|
-
end
|
392
|
-
end
|
390
|
+
data[:startdate] = I18n.l(value, format: :decidim_short) if value.present? && value.is_a?(ActiveSupport::TimeWithZone)
|
393
391
|
datepicker_format = ruby_format_to_datepicker(I18n.t("time.formats.decidim_short"))
|
394
392
|
data[:"date-format"] = datepicker_format
|
395
393
|
|
@@ -402,97 +400,117 @@ module Decidim
|
|
402
400
|
template.html_safe
|
403
401
|
end
|
404
402
|
|
403
|
+
# Public: Generates a file upload field for Decidim::Attachment type of attachment.
|
404
|
+
# It is similar to upload method, but it changes some options so that attachment can
|
405
|
+
# have title and different upload validations.
|
406
|
+
#
|
407
|
+
# attribute - The String name of the attribute to build the field.
|
408
|
+
# options - A Hash with options to build the field. See upload method for
|
409
|
+
# more detailed information.
|
410
|
+
def attachment(attribute, options = {})
|
411
|
+
object_attachment = object.attachment.present?
|
412
|
+
record = object_attachment ? object.attachment : object
|
413
|
+
options = {
|
414
|
+
titled: true,
|
415
|
+
resource_class: "Decidim::Attachment",
|
416
|
+
show_current: false,
|
417
|
+
max_file_size: max_file_size(record, :file),
|
418
|
+
label: I18n.t("decidim.forms.upload.labels.add_attachment"),
|
419
|
+
button_edit_label: I18n.t("decidim.forms.upload.labels.edit_image"),
|
420
|
+
extension_allowlist: Decidim.organization_settings(Decidim::Attachment).upload_allowed_file_extensions
|
421
|
+
}.merge(options)
|
422
|
+
|
423
|
+
# Upload help uses extension allowlist from the options so we need to call this AFTER setting the defaults.
|
424
|
+
options[:help] = upload_help(record, attribute, options) if options[:help].blank?
|
425
|
+
|
426
|
+
upload(attribute, options)
|
427
|
+
end
|
428
|
+
|
405
429
|
# Public: Generates a file upload field and sets the form as multipart.
|
406
430
|
# If the file is an image it displays the default image if present or the current one.
|
407
|
-
# By default it also generates a
|
408
|
-
# be hidden if `options[:optional]` is passed as `false`.
|
431
|
+
# By default it also generates a button to replace the file.
|
409
432
|
#
|
410
|
-
# attribute - The String name of the attribute to
|
433
|
+
# attribute - The String name of the attribute to build the field.
|
411
434
|
# options - A Hash with options to build the field.
|
435
|
+
# * max_file_size: Maximum size for the file (If you really want to change max
|
436
|
+
# file size you should probably change it in validator).
|
437
|
+
# * resouce_name: Name of the resource (e.g. user)
|
438
|
+
# * resource_class: Attribute's resource class (e.g. Decidim::User)
|
439
|
+
# * resouce_class: Class of the resource (e.g. user)
|
412
440
|
# * optional: Whether the file can be optional or not.
|
413
|
-
#
|
414
|
-
#
|
441
|
+
# * titled: Whether the file can have title or not.
|
442
|
+
# * show_current: Whether the current file is displayed next to the button.
|
443
|
+
# * help: Array of help messages which are displayed inside of the upload modal.
|
444
|
+
# * dimensions_info: Hash about resize dimensions (e.g. {:medium=>{:processor=>:resize_to_fit, :dimensions=>[600, 160]}})
|
445
|
+
# produces 'Resized to fit 600 x 160 px.'
|
446
|
+
# * extension_allowlist: Array of allowed file extensions (e.g. %w(jpeg jpg png))
|
447
|
+
# * label: Label for the attribute
|
448
|
+
# * button_label: Label for the button
|
449
|
+
# * button_edit_label: Button label when file is already selected.
|
415
450
|
def upload(attribute, options = {})
|
416
451
|
self.multipart = true
|
417
|
-
|
418
|
-
|
419
|
-
|
452
|
+
max_file_size = options[:max_file_size] || max_file_size(object, attribute)
|
453
|
+
button_label = options[:button_label] || choose_button_label(attribute)
|
454
|
+
help_messages = options[:help] || upload_help(object, attribute, options)
|
420
455
|
|
421
|
-
|
422
|
-
|
423
|
-
|
424
|
-
|
425
|
-
|
456
|
+
options = {
|
457
|
+
attribute: attribute,
|
458
|
+
resource_name: @object_name,
|
459
|
+
resource_class: options[:resource_class]&.to_s || resource_class(attribute),
|
460
|
+
optional: true,
|
461
|
+
titled: false,
|
462
|
+
show_current: true,
|
463
|
+
max_file_size: max_file_size,
|
464
|
+
help: help_messages,
|
465
|
+
label: label_for(attribute),
|
466
|
+
button_label: button_label,
|
467
|
+
button_edit_label: I18n.t("decidim.forms.upload.labels.replace")
|
468
|
+
}.merge(options)
|
426
469
|
|
427
|
-
|
428
|
-
|
470
|
+
::Decidim::ViewModel.cell(
|
471
|
+
"decidim/upload_modal",
|
472
|
+
self,
|
473
|
+
options
|
474
|
+
).call
|
475
|
+
end
|
429
476
|
|
430
|
-
|
431
|
-
|
477
|
+
def max_file_size(record, attribute)
|
478
|
+
Decidim::FileValidatorHumanizer.new(record, attribute).max_file_size
|
479
|
+
end
|
432
480
|
|
433
|
-
|
434
|
-
|
435
|
-
|
436
|
-
|
481
|
+
def choose_button_label(attribute)
|
482
|
+
@choose_button_label ||= begin
|
483
|
+
if resource_class(attribute).attached_config[attribute].uploader <= Decidim::ImageUploader
|
484
|
+
I18n.t("decidim.forms.upload.labels.add_image")
|
437
485
|
else
|
438
|
-
|
439
|
-
template += @template.link_to @template.image_tag(default_image_path, alt: alt_text), default_image_path, target: "_blank", rel: "noopener"
|
486
|
+
I18n.t("decidim.forms.upload.labels.add_file")
|
440
487
|
end
|
441
|
-
|
442
|
-
|
443
|
-
template += @template.link_to file.filename, file_path, target: "_blank", rel: "noopener"
|
488
|
+
rescue NoMethodError
|
489
|
+
I18n.t("decidim.forms.upload.labels.add_file")
|
444
490
|
end
|
445
|
-
|
446
|
-
if file_path.present? && options[:optional]
|
447
|
-
template += content_tag :div, class: "field" do
|
448
|
-
safe_join([
|
449
|
-
@template.check_box(@object_name, "remove_#{attribute}"),
|
450
|
-
label("remove_#{attribute}", I18n.t("remove_this_file", scope: "decidim.forms"))
|
451
|
-
])
|
452
|
-
end
|
453
|
-
end
|
454
|
-
|
455
|
-
if object.errors[attribute].any?
|
456
|
-
template += content_tag :p, class: "is-invalid-label" do
|
457
|
-
safe_join object.errors[attribute], "<br/>".html_safe
|
458
|
-
end
|
459
|
-
end
|
460
|
-
|
461
|
-
template.html_safe
|
462
491
|
end
|
463
|
-
# rubocop:enable Metrics/CyclomaticComplexity
|
464
|
-
# rubocop:enable Metrics/PerceivedComplexity
|
465
|
-
|
466
|
-
def upload_help(attribute, options = {})
|
467
|
-
humanizer = FileValidatorHumanizer.new(object, attribute)
|
468
492
|
|
469
|
-
|
470
|
-
|
471
|
-
options[:help_i18n_scope]
|
472
|
-
elsif humanizer.uploader.is_a?(Decidim::ImageUploader)
|
473
|
-
"decidim.forms.file_help.image"
|
474
|
-
else
|
475
|
-
"decidim.forms.file_help.file"
|
476
|
-
end
|
477
|
-
end
|
493
|
+
def upload_help(record, attribute, options = {})
|
494
|
+
humanizer = FileValidatorHumanizer.new(record, attribute)
|
478
495
|
|
479
|
-
|
480
|
-
|
481
|
-
|
482
|
-
|
483
|
-
|
484
|
-
|
485
|
-
|
496
|
+
help_scope = if options[:help_i18n_scope].present?
|
497
|
+
options[:help_i18n_scope]
|
498
|
+
elsif humanizer.uploader.is_a?(Decidim::ImageUploader)
|
499
|
+
"decidim.forms.file_help.image"
|
500
|
+
else
|
501
|
+
"decidim.forms.file_help.file"
|
502
|
+
end
|
486
503
|
|
487
|
-
|
488
|
-
|
489
|
-
|
490
|
-
|
491
|
-
|
504
|
+
help_messages = if options[:help_i18n_messages].present?
|
505
|
+
Array(options[:help_i18n_messages])
|
506
|
+
else
|
507
|
+
%w(message_1 message_2)
|
508
|
+
end
|
492
509
|
|
493
|
-
|
494
|
-
|
495
|
-
|
510
|
+
help_messages = help_messages.each.map { |msg| I18n.t(msg, scope: help_scope) } + humanizer.messages
|
511
|
+
help_messages += extension_allowlist_help(options[:extension_allowlist]) if options[:extension_allowlist]
|
512
|
+
help_messages += image_dimensions_help(options[:dimensions_info]) if options[:dimensions_info]
|
513
|
+
help_messages
|
496
514
|
end
|
497
515
|
|
498
516
|
# Public: Returns the translated name for the given attribute.
|
@@ -533,15 +551,15 @@ module Decidim
|
|
533
551
|
# inputs inside the label and to automatically inject validations
|
534
552
|
# from the object.
|
535
553
|
#
|
536
|
-
# attribute - The String name of the attribute to
|
554
|
+
# attribute - The String name of the attribute to build the field.
|
537
555
|
# options - A Hash with options to build the field.
|
538
556
|
# html_options - An optional Hash with options to pass to the html element.
|
539
557
|
#
|
540
558
|
# Returns a String
|
541
559
|
def field(attribute, options, html_options = nil, &block)
|
542
560
|
label = options.delete(:label)
|
543
|
-
label_options = options.delete(:label_options)
|
544
|
-
custom_label(attribute, label, label_options) do
|
561
|
+
label_options = options.delete(:label_options) || {}
|
562
|
+
custom_label(attribute, label, { required: options[:required] }.merge(label_options)) do
|
545
563
|
field_with_validations(attribute, options, html_options, &block)
|
546
564
|
end
|
547
565
|
end
|
@@ -656,7 +674,7 @@ module Decidim
|
|
656
674
|
def find_validator(attribute, klass)
|
657
675
|
return unless object.respond_to?(:_validators)
|
658
676
|
|
659
|
-
object._validators[attribute.to_sym].find { |validator| validator.
|
677
|
+
object._validators[attribute.to_sym].find { |validator| validator.instance_of?(klass) }
|
660
678
|
end
|
661
679
|
|
662
680
|
# Private: Override method from FoundationRailsHelper to render the text of the
|
@@ -672,8 +690,16 @@ module Decidim
|
|
672
690
|
def custom_label(attribute, text, options, field_before_label: false, show_required: true)
|
673
691
|
return block_given? ? yield.html_safe : "".html_safe if text == false
|
674
692
|
|
693
|
+
required = options.is_a?(Hash) && options.delete(:required)
|
675
694
|
text = default_label_text(object, attribute) if text.nil? || text == true
|
676
|
-
|
695
|
+
if show_required
|
696
|
+
text +=
|
697
|
+
if required
|
698
|
+
required_indicator
|
699
|
+
else
|
700
|
+
required_for_attribute(attribute)
|
701
|
+
end
|
702
|
+
end
|
677
703
|
|
678
704
|
text = if field_before_label && block_given?
|
679
705
|
safe_join([yield, text.html_safe])
|
@@ -755,45 +781,36 @@ module Decidim
|
|
755
781
|
options[:class] ||= ""
|
756
782
|
options[:class] += " is-invalid-label"
|
757
783
|
end
|
758
|
-
text +=
|
784
|
+
text +=
|
785
|
+
if options.delete(:required)
|
786
|
+
required_indicator
|
787
|
+
else
|
788
|
+
required_for_attribute(attribute)
|
789
|
+
end
|
759
790
|
|
760
791
|
label(attribute, (text || "").html_safe, options)
|
761
792
|
end
|
762
793
|
|
763
|
-
|
764
|
-
|
765
|
-
def uploader_default_image_path(attribute)
|
766
|
-
uploader = FileValidatorHumanizer.new(object, attribute).uploader
|
767
|
-
return if uploader.blank?
|
768
|
-
return unless uploader.is_a?(Decidim::ImageUploader)
|
769
|
-
|
770
|
-
uploader.try(:default_url)
|
771
|
-
end
|
772
|
-
|
773
|
-
# Private: Returns blob path when file is attached
|
774
|
-
def file_attachment_path(file)
|
775
|
-
return unless file && file.try(:attached?)
|
794
|
+
def required_for_attribute(attribute)
|
795
|
+
return required_indicator if attribute_required?(attribute)
|
776
796
|
|
777
|
-
|
797
|
+
"".html_safe
|
778
798
|
end
|
779
799
|
|
780
|
-
def
|
781
|
-
|
782
|
-
|
783
|
-
|
784
|
-
|
785
|
-
|
786
|
-
|
787
|
-
|
788
|
-
|
789
|
-
|
790
|
-
|
791
|
-
|
792
|
-
|
793
|
-
|
794
|
-
).html_safe
|
795
|
-
end
|
796
|
-
"".html_safe
|
800
|
+
def required_indicator
|
801
|
+
visible_title = content_tag(:span, "*", "aria-hidden": true)
|
802
|
+
screenreader_title = content_tag(
|
803
|
+
:span,
|
804
|
+
I18n.t("required", scope: "forms"),
|
805
|
+
class: "show-for-sr"
|
806
|
+
)
|
807
|
+
content_tag(
|
808
|
+
:span,
|
809
|
+
visible_title + screenreader_title,
|
810
|
+
title: I18n.t("required", scope: "forms"),
|
811
|
+
data: { tooltip: true, disable_hover: false, keep_on_hover: true },
|
812
|
+
class: "label-required"
|
813
|
+
).html_safe
|
797
814
|
end
|
798
815
|
|
799
816
|
# Private: Returns an array of scopes related to object attribute
|
@@ -827,28 +844,17 @@ module Decidim
|
|
827
844
|
end
|
828
845
|
|
829
846
|
def extension_allowlist_help(extension_allowlist)
|
830
|
-
|
831
|
-
safe_join([
|
832
|
-
content_tag(:span, I18n.t("extension_allowlist", scope: "decidim.forms.files")),
|
833
|
-
" ",
|
834
|
-
safe_join(extension_allowlist.map { |ext| content_tag(:b, ext) }, ", ")
|
835
|
-
])
|
836
|
-
end
|
847
|
+
["#{I18n.t("extension_allowlist", scope: "decidim.forms.files")} #{extension_allowlist.map { |ext| ext }.join(", ")}"]
|
837
848
|
end
|
838
849
|
|
839
850
|
def image_dimensions_help(dimensions_info)
|
840
|
-
|
841
|
-
|
842
|
-
|
843
|
-
|
844
|
-
|
845
|
-
|
846
|
-
|
847
|
-
dimensions = @template.content_tag(:b, I18n.t("dimensions", scope: "decidim.forms.images", width: info[:dimensions].first, height: info[:dimensions].last))
|
848
|
-
safe_join([processor, " ", dimensions, ". ".html_safe])
|
849
|
-
end)
|
850
|
-
end
|
851
|
-
])
|
851
|
+
dimensions_info.map do |_version, info|
|
852
|
+
dimensions = I18n.t("dimensions", scope: "decidim.forms.images", width: info[:dimensions].first, height: info[:dimensions].last)
|
853
|
+
I18n.t(
|
854
|
+
"processors.#{info[:processor]}",
|
855
|
+
scope: "decidim.forms.images",
|
856
|
+
dimensions: dimensions
|
857
|
+
).html_safe
|
852
858
|
end
|
853
859
|
end
|
854
860
|
|
@@ -910,5 +916,28 @@ module Decidim
|
|
910
916
|
end
|
911
917
|
end
|
912
918
|
end
|
919
|
+
|
920
|
+
def editor_images_options(options)
|
921
|
+
return {} unless options[:editor_images]
|
922
|
+
|
923
|
+
{
|
924
|
+
editor_images: true,
|
925
|
+
upload_images_path: Decidim::Core::Engine.routes.url_helpers.editor_images_path,
|
926
|
+
drag_and_drop_help_text: I18n.t("drag_and_drop_help", scope: "decidim.editor_images")
|
927
|
+
}
|
928
|
+
end
|
929
|
+
|
930
|
+
# Private: Determines the correct resource class for validators from the
|
931
|
+
# object or its PassthruValidator.
|
932
|
+
def resource_class(attribute)
|
933
|
+
if object._validators[attribute].is_a?(Array) && object._validators[attribute].size.positive?
|
934
|
+
passthru = object._validators[attribute].find { |v| v.is_a?(PassthruValidator) }
|
935
|
+
return passthru.options[:to] if passthru && passthru.options[:to].present?
|
936
|
+
end
|
937
|
+
klass = object.send(attribute)
|
938
|
+
return object.send(attribute).record.class if klass.respond_to?(:record) && klass.record.present?
|
939
|
+
|
940
|
+
object.class
|
941
|
+
end
|
913
942
|
end
|
914
943
|
end
|
@@ -5,7 +5,7 @@ module Decidim
|
|
5
5
|
# This class represents an abstract badge. Instances of this class can define
|
6
6
|
# different badge types with different rules such as gaining new levels, etc.
|
7
7
|
class Badge
|
8
|
-
include
|
8
|
+
include Decidim::AttributeObject::Model
|
9
9
|
include ActiveModel::Validations
|
10
10
|
|
11
11
|
# The name of the badge.
|
@@ -14,7 +14,7 @@ module Decidim
|
|
14
14
|
# An array of scores needed to reach a new level. For example, the array
|
15
15
|
# [1, 5, 10] represents 1 point to get to Level 1, 5 points to get to level 2,
|
16
16
|
# 10 points to get to level 3.
|
17
|
-
attribute :levels, Array, default: []
|
17
|
+
attribute :levels, Array[Integer], default: []
|
18
18
|
|
19
19
|
# An array of types for which this badge is valid for.
|
20
20
|
attribute :valid_for, Array[Symbol], default: [:user]
|
@@ -27,7 +27,6 @@ module Decidim
|
|
27
27
|
attribute :reset, Proc
|
28
28
|
|
29
29
|
validates :name, :levels, presence: true
|
30
|
-
validates :levels, empty: false
|
31
30
|
|
32
31
|
validate do
|
33
32
|
errors.add(:levels, "level thresholds should be ordered") if levels.sort != levels
|
@@ -0,0 +1,27 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "active_support/concern"
|
4
|
+
|
5
|
+
module Decidim
|
6
|
+
# A concern with the components needed when you want a model to belong to an
|
7
|
+
# area.
|
8
|
+
module HasArea
|
9
|
+
extend ActiveSupport::Concern
|
10
|
+
|
11
|
+
included do
|
12
|
+
belongs_to :area,
|
13
|
+
foreign_key: "decidim_area_id",
|
14
|
+
class_name: "Decidim::Area",
|
15
|
+
optional: true
|
16
|
+
|
17
|
+
scope :with_area, ->(area_id) { where(decidim_area_id: area_id) }
|
18
|
+
|
19
|
+
scope :with_any_area, lambda { |*original_area_ids|
|
20
|
+
area_ids = original_area_ids.map { |id| id.to_s.split("_") }.flatten.uniq
|
21
|
+
return self if area_ids.include?("all")
|
22
|
+
|
23
|
+
where(decidim_area_id: area_ids)
|
24
|
+
}
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|