decidim-core 0.26.2 → 0.27.0.rc2
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 +3 -8
- data/app/cells/decidim/announcement_cell.rb +2 -2
- data/app/cells/decidim/author_cell.rb +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/hero_cell.rb +1 -0
- 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 +5 -4
- 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/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 +2 -13
- data/app/cells/decidim/versions_list_cell.rb +2 -13
- 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 -1
- 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 +1 -1
- data/app/commands/decidim/unsubscribe_settings.rb +1 -1
- data/app/commands/decidim/update_account.rb +5 -3
- 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 +4 -0
- data/app/controllers/decidim/account_controller.rb +45 -0
- data/app/controllers/decidim/application_controller.rb +1 -1
- data/app/controllers/decidim/devise/invitations_controller.rb +2 -0
- data/app/controllers/decidim/devise/passwords_controller.rb +33 -0
- data/app/controllers/decidim/devise/registrations_controller.rb +7 -1
- 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 -0
- data/app/controllers/decidim/last_activities_controller.rb +8 -9
- 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 +1 -1
- 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 +6 -8
- data/app/events/decidim/change_nickname_event.rb +21 -0
- data/app/events/decidim/resource_endorsed_event.rb +2 -1
- data/app/forms/decidim/account_form.rb +8 -7
- 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 +8 -2
- data/app/forms/decidim/password_form.rb +10 -0
- data/app/forms/decidim/registration_form.rb +10 -4
- data/app/forms/decidim/upload_validation_form.rb +54 -0
- data/app/forms/decidim/user_group_form.rb +2 -2
- 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_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/filters_helper.rb +5 -1
- data/app/helpers/decidim/followable_helper.rb +1 -1
- data/app/helpers/decidim/icon_helper.rb +1 -1
- data/app/helpers/decidim/layout_helper.rb +15 -1
- data/app/helpers/decidim/map_helper.rb +12 -8
- data/app/helpers/decidim/meta_tags_helper.rb +0 -2
- data/app/helpers/decidim/notifications_settings_helper.rb +15 -0
- data/app/helpers/decidim/passwords_helper.rb +41 -0
- data/app/helpers/decidim/sanitize_helper.rb +12 -2
- 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 -5
- 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/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 +2 -2
- data/app/mailers/decidim/newsletters_opt_in_mailer.rb +7 -5
- 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/notification.rb +14 -2
- data/app/models/decidim/oauth_application.rb +12 -1
- data/app/models/decidim/organization.rb +7 -7
- 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 +5 -0
- data/app/models/decidim/share_token.rb +0 -2
- data/app/models/decidim/short_link.rb +162 -0
- data/app/models/decidim/user.rb +34 -6
- data/app/models/decidim/user_base_entity.rb +2 -1
- data/app/models/decidim/user_group.rb +3 -3
- 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/src/decidim/account_form.js +68 -18
- data/app/packs/src/decidim/autocomplete.js +298 -0
- data/app/packs/src/decidim/data_consent/consent_manager.js +136 -0
- data/app/packs/src/decidim/data_consent/consent_manager.test.js +280 -0
- data/app/packs/src/decidim/data_consent/index.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/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/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 +215 -22
- data/app/packs/src/decidim/input_multiple_mentions.js +87 -187
- data/app/packs/src/decidim/map/factory.js +3 -1
- data/app/packs/src/decidim/map/icon.js +2 -1
- data/app/packs/src/decidim/map/legacy.js +2 -2
- data/app/packs/src/decidim/map/svg-icon.js +248 -0
- data/app/packs/src/decidim/map.js +2 -2
- 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 +37 -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/{metrics.js → index.js} +0 -0
- 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/email.scss +66 -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/_cards.scss +2 -0
- data/app/packs/stylesheets/decidim/modules/_comments.scss +2 -0
- data/app/packs/stylesheets/decidim/modules/_data-consent.scss +115 -0
- data/app/packs/stylesheets/decidim/modules/_footer.scss +4 -0
- data/app/packs/stylesheets/decidim/modules/_forms.scss +5 -0
- 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/permissions/decidim/permissions.rb +6 -6
- 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/home_stats_presenter.rb +4 -2
- 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_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 +25 -0
- data/app/presenters/decidim/stats_presenter.rb +1 -1
- data/app/presenters/decidim/user_presenter.rb +4 -1
- 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/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 -77
- 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/admin_input_scrubber.rb +25 -0
- data/app/scrubbers/decidim/user_input_scrubber.rb +3 -5
- 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 +30 -0
- data/app/services/decidim/notification_generator_for_recipient.rb +1 -1
- data/app/services/decidim/notifications_digest_sending_decider.rb +22 -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 +61 -0
- data/app/services/decidim/traceability.rb +1 -1
- 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/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/{_document.html.erb → _document.erb} +0 -0
- data/app/views/decidim/application/{_documents.html.erb → _documents.erb} +2 -2
- data/app/views/decidim/application/{_photos.html.erb → _photos.erb} +0 -0
- 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/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}/export.html.erb +0 -0
- 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/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/_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/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 +67 -44
- 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 +11 -13
- 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/_data_consent_warning.html.erb +8 -0
- 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/_main_footer.html.erb +1 -0
- data/app/views/layouts/decidim/_offline_banner.html.erb +11 -0
- data/app/views/layouts/decidim/widget.html.erb +2 -2
- data/config/assets.rb +1 -0
- data/config/locales/ar.yml +48 -45
- data/config/locales/bg.yml +15 -39
- data/config/locales/ca.yml +191 -45
- data/config/locales/cs.yml +192 -44
- data/config/locales/de.yml +227 -44
- data/config/locales/el.yml +15 -39
- data/config/locales/en.yml +187 -41
- data/config/locales/eo.yml +4 -6
- data/config/locales/es-MX.yml +190 -44
- data/config/locales/es-PY.yml +190 -44
- data/config/locales/es.yml +190 -44
- data/config/locales/eu.yml +16 -46
- data/config/locales/fi-plain.yml +188 -42
- data/config/locales/fi.yml +188 -42
- data/config/locales/fr-CA.yml +189 -43
- data/config/locales/fr.yml +196 -50
- data/config/locales/ga-IE.yml +5 -9
- data/config/locales/gl.yml +47 -39
- data/config/locales/hu.yml +312 -41
- data/config/locales/id-ID.yml +15 -38
- data/config/locales/is-IS.yml +6 -15
- data/config/locales/it.yml +23 -48
- data/config/locales/ja.yml +189 -44
- data/config/locales/lb.yml +16 -41
- data/config/locales/lt.yml +1950 -0
- data/config/locales/lv.yml +15 -37
- data/config/locales/nl.yml +41 -43
- data/config/locales/no.yml +25 -45
- data/config/locales/pl.yml +113 -41
- data/config/locales/pt-BR.yml +17 -41
- data/config/locales/pt.yml +16 -41
- data/config/locales/ro-RO.yml +20 -45
- data/config/locales/ru.yml +15 -27
- data/config/locales/sk.yml +15 -39
- data/config/locales/sl.yml +1 -0
- data/config/locales/sr-CS.yml +1 -0
- data/config/locales/sv.yml +73 -43
- data/config/locales/tr-TR.yml +15 -38
- data/config/locales/uk.yml +15 -26
- data/config/locales/zh-CN.yml +17 -39
- data/config/routes.rb +37 -4
- data/db/migrate/20180508111710_add_accepted_tos_version_field_to_users.rb +1 -0
- data/db/migrate/20181030090144_destroy_deleted_users_follows.rb +1 -0
- data/db/migrate/20190412131728_fix_user_names.rb +4 -4
- 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 -18
- 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/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 +9 -7
- data/lib/decidim/attributes/model.rb +32 -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 +9 -7
- 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 +30 -19
- data/lib/decidim/core/test/factories.rb +48 -8
- 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 -0
- 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 +2 -2
- data/lib/decidim/core/test/shared_examples/preview_component_with_share_token_examples.rb +0 -6
- data/lib/decidim/core/test/shared_examples/resource_endorsed_event_examples.rb +60 -0
- 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/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/versions_controller_examples.rb +40 -0
- data/lib/decidim/core/test/shared_examples/with_endorsable_permissions_examples.rb +1 -1
- data/lib/decidim/core/test.rb +2 -0
- data/lib/decidim/core/version.rb +1 -1
- data/lib/decidim/core.rb +149 -16
- data/lib/decidim/dependency_resolver.rb +272 -0
- 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/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 +13 -4
- data/lib/decidim/exporters/export_data.rb +1 -1
- data/lib/decidim/exporters/export_manifest.rb +2 -1
- 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 +158 -130
- 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 +0 -2
- 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 +46 -1
- 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/processes_file_locally.rb +31 -0
- 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 +11 -0
- 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 +20 -9
- 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 +190 -85
- data/app/controllers/decidim/cookie_policy_controller.rb +0 -24
- data/app/helpers/decidim/cookies_helper.rb +0 -11
- 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/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/devise/registrations/edit.html.erb +0 -41
- data/app/views/decidim/export_mailer/data_portability_export.html.erb +0 -7
- data/app/views/layouts/decidim/_cookie_warning.html.erb +0 -8
- data/lib/decidim/data_portability_serializers.rb +0 -23
- data/lib/decidim/middleware/rails_cookies.rb +0 -23
@@ -0,0 +1,14 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
# This migration comes from active_storage (originally 20191206030411)
|
4
|
+
class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0]
|
5
|
+
def change
|
6
|
+
create_table :active_storage_variant_records do |t|
|
7
|
+
t.belongs_to :blob, null: false, index: false
|
8
|
+
t.string :variation_digest, null: false
|
9
|
+
|
10
|
+
t.index [:blob_id, :variation_digest], name: "index_active_storage_variant_records_uniqueness", unique: true
|
11
|
+
t.foreign_key :active_storage_blobs, column: :blob_id
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
@@ -0,0 +1,11 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class CreateDecidimReminders < ActiveRecord::Migration[6.0]
|
4
|
+
def change
|
5
|
+
create_table :decidim_reminders do |t|
|
6
|
+
t.belongs_to :decidim_user, index: true, foreign_key: true, null: false
|
7
|
+
t.belongs_to :decidim_component, index: true, foreign_key: true
|
8
|
+
t.timestamps
|
9
|
+
end
|
10
|
+
end
|
11
|
+
end
|
@@ -0,0 +1,11 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class CreateDecidimReminderRecords < ActiveRecord::Migration[6.0]
|
4
|
+
def change
|
5
|
+
create_table :decidim_reminder_records do |t|
|
6
|
+
t.string :state, :string, index: true, default: "active"
|
7
|
+
t.belongs_to :decidim_reminder, index: true, foreign_key: true
|
8
|
+
t.belongs_to :remindable, polymorphic: true, null: false, index: { name: "index_decidim_reminder_records_remindable" }
|
9
|
+
end
|
10
|
+
end
|
11
|
+
end
|
@@ -0,0 +1,10 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class CreateDecidimReminderDeliveries < ActiveRecord::Migration[6.0]
|
4
|
+
def change
|
5
|
+
create_table :decidim_reminder_deliveries do |t|
|
6
|
+
t.belongs_to :decidim_reminder, index: true, foreign_key: true
|
7
|
+
t.timestamps
|
8
|
+
end
|
9
|
+
end
|
10
|
+
end
|
@@ -0,0 +1,15 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class DropEmailsOnNotificationsFlagFromUser < ActiveRecord::Migration[5.1]
|
4
|
+
class DecidimUser < ApplicationRecord
|
5
|
+
self.table_name = :decidim_users
|
6
|
+
end
|
7
|
+
|
8
|
+
def change
|
9
|
+
# rubocop:disable Rails/SkipsModelValidations
|
10
|
+
DecidimUser.where(email_on_notification: true).update_all(notifications_sending_frequency: "real_time")
|
11
|
+
# rubocop:enable Rails/SkipsModelValidations
|
12
|
+
|
13
|
+
remove_column :decidim_users, :email_on_notification
|
14
|
+
end
|
15
|
+
end
|
@@ -0,0 +1,20 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class AddPreviousPasswordsToUsers < ActiveRecord::Migration[6.1]
|
4
|
+
class User < ApplicationRecord
|
5
|
+
self.table_name = :decidim_users
|
6
|
+
end
|
7
|
+
|
8
|
+
def change
|
9
|
+
add_column :decidim_users, :password_updated_at, :datetime
|
10
|
+
add_column :decidim_users, :previous_passwords, :string, array: true, default: []
|
11
|
+
|
12
|
+
reversible do |direction|
|
13
|
+
direction.up do
|
14
|
+
# rubocop:disable Rails/SkipsModelValidations
|
15
|
+
User.update_all("password_updated_at = updated_at")
|
16
|
+
# rubocop:enable Rails/SkipsModelValidations
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
@@ -0,0 +1,23 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class CreateDecidimShortLinks < ActiveRecord::Migration[6.1]
|
4
|
+
def change
|
5
|
+
create_table :decidim_short_links do |t|
|
6
|
+
t.references :decidim_organization, null: false, index: true
|
7
|
+
t.references :target, polymorphic: true, null: false, index: true
|
8
|
+
t.string :identifier, limit: 10, null: false
|
9
|
+
t.string :mounted_engine_name, index: true
|
10
|
+
t.string :route_name, index: true
|
11
|
+
t.jsonb :params
|
12
|
+
|
13
|
+
t.timestamps
|
14
|
+
end
|
15
|
+
|
16
|
+
add_index(
|
17
|
+
:decidim_short_links,
|
18
|
+
[:decidim_organization_id, :identifier],
|
19
|
+
unique: true,
|
20
|
+
name: "idx_decidim_short_links_organization_id_identifier"
|
21
|
+
)
|
22
|
+
end
|
23
|
+
end
|
data/db/seeds.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
if !Rails.env.production? || ENV
|
3
|
+
if !Rails.env.production? || ENV.fetch("SEED", nil)
|
4
4
|
print "Creating seeds for decidim-core...\n" unless Rails.env.test?
|
5
5
|
|
6
6
|
require "decidim/faker/localized"
|
@@ -17,8 +17,8 @@ if !Rails.env.production? || ENV["SEED"]
|
|
17
17
|
table.tr("_", "/").classify.safe_constantize
|
18
18
|
end.compact.each(&:reset_column_information)
|
19
19
|
|
20
|
-
smtp_label = ENV
|
21
|
-
smtp_email = ENV
|
20
|
+
smtp_label = ENV.fetch("SMTP_FROM_LABEL", Faker::Twitter.unique.screen_name)
|
21
|
+
smtp_email = ENV.fetch("SMTP_FROM_EMAIL", Faker::Internet.email)
|
22
22
|
|
23
23
|
organization = Decidim::Organization.first || Decidim::Organization.create!(
|
24
24
|
name: Faker::Company.name,
|
@@ -31,12 +31,12 @@ if !Rails.env.production? || ENV["SEED"]
|
|
31
31
|
from: "#{smtp_label} <#{smtp_email}>",
|
32
32
|
from_email: smtp_email,
|
33
33
|
from_label: smtp_label,
|
34
|
-
user_name: ENV
|
35
|
-
encrypted_password: Decidim::AttributeEncryptor.encrypt(ENV
|
36
|
-
address: ENV
|
37
|
-
port: ENV
|
34
|
+
user_name: ENV.fetch("SMTP_USERNAME", Faker::Twitter.unique.screen_name),
|
35
|
+
encrypted_password: Decidim::AttributeEncryptor.encrypt(ENV.fetch("SMTP_PASSWORD", Faker::Internet.password(min_length: 8))),
|
36
|
+
address: ENV.fetch("SMTP_ADDRESS", nil) || ENV.fetch("DECIDIM_HOST", "localhost"),
|
37
|
+
port: ENV.fetch("SMTP_PORT", nil) || ENV.fetch("DECIDIM_SMTP_PORT", "25")
|
38
38
|
},
|
39
|
-
host: ENV
|
39
|
+
host: ENV.fetch("DECIDIM_HOST", "localhost"),
|
40
40
|
external_domain_whitelist: ["decidim.org", "github.com"],
|
41
41
|
description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
|
42
42
|
Decidim::Faker::Localized.sentence(word_count: 15)
|
@@ -115,12 +115,9 @@ if !Rails.env.production? || ENV["SEED"]
|
|
115
115
|
end
|
116
116
|
|
117
117
|
admin = Decidim::User.find_or_initialize_by(email: "admin@example.org")
|
118
|
-
|
119
|
-
admin.update!(
|
118
|
+
admin_hash = {
|
120
119
|
name: Faker::Name.name,
|
121
120
|
nickname: Faker::Twitter.unique.screen_name,
|
122
|
-
password: "decidim123456",
|
123
|
-
password_confirmation: "decidim123456",
|
124
121
|
organization: organization,
|
125
122
|
confirmed_at: Time.current,
|
126
123
|
locale: I18n.default_locale,
|
@@ -130,14 +127,16 @@ if !Rails.env.production? || ENV["SEED"]
|
|
130
127
|
about: Faker::Lorem.paragraph(sentence_count: 2),
|
131
128
|
accepted_tos_version: organization.tos_version,
|
132
129
|
admin_terms_accepted_at: Time.current
|
133
|
-
|
130
|
+
}
|
131
|
+
admin_hash.merge!(password: "decidim123456789", password_confirmation: "decidim123456789") if admin.encrypted_password.blank?
|
132
|
+
admin.update!(admin_hash)
|
134
133
|
|
135
134
|
["user@example.org", "user2@example.org"].each do |email|
|
136
135
|
Decidim::User.find_or_initialize_by(email: email).update!(
|
137
136
|
name: Faker::Name.name,
|
138
137
|
nickname: Faker::Twitter.unique.screen_name,
|
139
|
-
password: "
|
140
|
-
password_confirmation: "
|
138
|
+
password: "decidim123456789",
|
139
|
+
password_confirmation: "decidim123456789",
|
141
140
|
confirmed_at: Time.current,
|
142
141
|
locale: I18n.default_locale,
|
143
142
|
organization: organization,
|
@@ -155,8 +154,8 @@ if !Rails.env.production? || ENV["SEED"]
|
|
155
154
|
locked_user.update!(
|
156
155
|
name: Faker::Name.name,
|
157
156
|
nickname: Faker::Twitter.unique.screen_name,
|
158
|
-
password: "
|
159
|
-
password_confirmation: "
|
157
|
+
password: "decidim123456789",
|
158
|
+
password_confirmation: "decidim123456789",
|
160
159
|
confirmed_at: Time.current,
|
161
160
|
locale: I18n.default_locale,
|
162
161
|
organization: organization,
|
@@ -211,7 +210,7 @@ if !Rails.env.production? || ENV["SEED"]
|
|
211
210
|
Decidim::System::CreateDefaultContentBlocks.call(organization)
|
212
211
|
|
213
212
|
hero_content_block = Decidim::ContentBlock.find_by(organization: organization, manifest_name: :hero, scope_name: :homepage)
|
214
|
-
hero_content_block.images_container.background_image = ActiveStorage::Blob.
|
213
|
+
hero_content_block.images_container.background_image = ActiveStorage::Blob.create_and_upload!(
|
215
214
|
io: File.open(File.join(seeds_root, "homepage_image.jpg")),
|
216
215
|
filename: "homepage_image.jpg",
|
217
216
|
content_type: "image/jpeg",
|
@@ -0,0 +1,47 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module ActsAsTree
|
5
|
+
extend ActiveSupport::Concern
|
6
|
+
|
7
|
+
included do
|
8
|
+
@parent_item_foreign_key = :parent_id
|
9
|
+
end
|
10
|
+
|
11
|
+
class_methods do
|
12
|
+
def parent_item_foreign_key(name = nil)
|
13
|
+
return @parent_item_foreign_key unless name
|
14
|
+
|
15
|
+
@parent_item_foreign_key = name
|
16
|
+
end
|
17
|
+
|
18
|
+
def tree_for(item)
|
19
|
+
where(Arel.sql("#{table_name}.id IN (#{tree_sql_for(item)})")).order("#{table_name}.id")
|
20
|
+
end
|
21
|
+
|
22
|
+
def tree_sql_for(item)
|
23
|
+
<<-SQL.squish
|
24
|
+
WITH RECURSIVE search_tree(id, path) AS (
|
25
|
+
SELECT id, ARRAY[id]
|
26
|
+
FROM #{table_name}
|
27
|
+
WHERE id = #{item.id}
|
28
|
+
UNION ALL
|
29
|
+
SELECT #{table_name}.id, path || #{table_name}.id
|
30
|
+
FROM search_tree
|
31
|
+
JOIN #{table_name} ON #{table_name}.#{parent_item_foreign_key} = search_tree.id
|
32
|
+
WHERE NOT #{table_name}.id = ANY(path)
|
33
|
+
)
|
34
|
+
SELECT id FROM search_tree ORDER BY path
|
35
|
+
SQL
|
36
|
+
end
|
37
|
+
end
|
38
|
+
|
39
|
+
def descendants
|
40
|
+
@descendants ||= self_and_descendants.where.not(id: id)
|
41
|
+
end
|
42
|
+
|
43
|
+
def self_and_descendants
|
44
|
+
@self_and_descendants ||= self.class.tree_for(self)
|
45
|
+
end
|
46
|
+
end
|
47
|
+
end
|
@@ -23,7 +23,8 @@ module Decidim
|
|
23
23
|
prepare: lambda { |direction, ctx|
|
24
24
|
lambda { |locale|
|
25
25
|
locale = ctx[:current_organization].default_locale if locale.blank?
|
26
|
-
|
26
|
+
field = Arel::Nodes::InfixOperation.new("->", Arel.sql("name"), Arel::Nodes.build_quoted(locale))
|
27
|
+
Arel::Nodes::InfixOperation.new("", field, Arel.sql(direction.upcase))
|
27
28
|
}
|
28
29
|
}
|
29
30
|
end
|
@@ -12,11 +12,12 @@ module Decidim
|
|
12
12
|
end
|
13
13
|
|
14
14
|
def author
|
15
|
-
if object.respond_to?(:normalized_author)
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
15
|
+
author = if object.respond_to?(:normalized_author)
|
16
|
+
object&.normalized_author
|
17
|
+
elsif object.respond_to?(:creator_identity)
|
18
|
+
object&.creator_identity
|
19
|
+
end
|
20
|
+
author if author.is_a?(Decidim::UserBaseEntity)
|
20
21
|
end
|
21
22
|
end
|
22
23
|
end
|
@@ -0,0 +1,80 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
# Asset router provides global access to the asset routes for assets saved
|
5
|
+
# through ActiveStorage. This handles the different cases for routing to the
|
6
|
+
# remote routes when using an assets CDN or to local routes when using the
|
7
|
+
# local disk storage driver.
|
8
|
+
class AssetRouter
|
9
|
+
# Initializes the router.
|
10
|
+
#
|
11
|
+
# @param [ActiveStorage::Attached, ActiveStorage::Blob] The asset to route
|
12
|
+
# to
|
13
|
+
def initialize(asset)
|
14
|
+
@asset = asset
|
15
|
+
end
|
16
|
+
|
17
|
+
# Generates the correct URL to the asset with the provided options.
|
18
|
+
#
|
19
|
+
# @param options The options for the URL that are the normal route options
|
20
|
+
# Rails route helpers accept
|
21
|
+
def url(**options)
|
22
|
+
if asset.is_a? ActiveStorage::Attached
|
23
|
+
routes.rails_blob_url(asset.blob, **default_options.merge(options))
|
24
|
+
else
|
25
|
+
routes.rails_representation_url(asset, **default_options.merge(options))
|
26
|
+
end
|
27
|
+
end
|
28
|
+
|
29
|
+
private
|
30
|
+
|
31
|
+
attr_reader :asset
|
32
|
+
|
33
|
+
# Provides the route helpers depending on whether the URL is generated to
|
34
|
+
# the local host or an external CDN (remote).
|
35
|
+
#
|
36
|
+
# @return [Module, Decidim::EngineRouter] The correct route helpers based
|
37
|
+
# on the configuration
|
38
|
+
def routes
|
39
|
+
@routes ||=
|
40
|
+
if remote?
|
41
|
+
Rails.application.routes.url_helpers
|
42
|
+
else
|
43
|
+
EngineRouter.new("main_app", {})
|
44
|
+
end
|
45
|
+
end
|
46
|
+
|
47
|
+
# Determines whether the assets call should be to a remote CDN or to the
|
48
|
+
# local server based on the storage options.
|
49
|
+
#
|
50
|
+
# @return [Boolean] A boolean indicating whether the assets are served
|
51
|
+
# through a remote CDN
|
52
|
+
def remote?
|
53
|
+
remote_storage_options.present?
|
54
|
+
end
|
55
|
+
|
56
|
+
# Determines the default options to be passed to the route helper. For the
|
57
|
+
# remote storage, returns the remote storage options and for the local disk
|
58
|
+
# storage returns an empty hash.
|
59
|
+
#
|
60
|
+
# @return [Hash] The default options hash to pass to the route helper
|
61
|
+
def default_options
|
62
|
+
@default_options ||=
|
63
|
+
if remote?
|
64
|
+
remote_storage_options
|
65
|
+
else
|
66
|
+
{}
|
67
|
+
end
|
68
|
+
end
|
69
|
+
|
70
|
+
# The remote storage options when using a remote CDN. An empty hash in case
|
71
|
+
# using the local disk storage.
|
72
|
+
#
|
73
|
+
# @return [Hash] The remote storage options hash
|
74
|
+
def remote_storage_options
|
75
|
+
@remote_storage_options ||= {
|
76
|
+
host: Rails.application.secrets.dig(:storage, :cdn_host)
|
77
|
+
}.compact
|
78
|
+
end
|
79
|
+
end
|
80
|
+
end
|
@@ -3,14 +3,14 @@
|
|
3
3
|
require "active_support/concern"
|
4
4
|
|
5
5
|
module Decidim
|
6
|
-
# A set of convenience methods to deal with attachment attributes for
|
6
|
+
# A set of convenience methods to deal with attachment attributes for
|
7
7
|
# models that may set the attachment records through the original model
|
8
8
|
# (Decidim::Attachment) or through the user submitted form data (String).
|
9
9
|
module AttachmentAttributes
|
10
10
|
extend ActiveSupport::Concern
|
11
11
|
|
12
12
|
class_methods do
|
13
|
-
# Public: Mirrors
|
13
|
+
# Public: Mirrors the `attribute` interface to define attachment
|
14
14
|
# attributes for form objects.
|
15
15
|
#
|
16
16
|
# name - The attribute's name
|
@@ -20,14 +20,14 @@ module Decidim
|
|
20
20
|
#
|
21
21
|
# attachment_attribute :photos
|
22
22
|
# # This will create two attributes of the following types:
|
23
|
-
# # attribute :photos, Array[
|
23
|
+
# # attribute :photos, Array[Integer]
|
24
24
|
# # attribute :add_photos, Array
|
25
25
|
# # In addition, it will generate the getter method for the attribute
|
26
26
|
# # returning an array of the Decidim::Attachment records.
|
27
27
|
#
|
28
28
|
# Returns nothing.
|
29
29
|
def attachments_attribute(name)
|
30
|
-
attribute name, Array[
|
30
|
+
attribute name, Array[Integer]
|
31
31
|
attribute "add_#{name}".to_sym, Array
|
32
32
|
|
33
33
|
# Define the getter method that fetches the attachment records based on
|
@@ -37,13 +37,13 @@ module Decidim
|
|
37
37
|
define_method name do
|
38
38
|
return instance_variable_get(variable_name) if instance_variable_defined?(variable_name)
|
39
39
|
|
40
|
-
original =
|
41
|
-
return original
|
40
|
+
original = @attributes[name.to_s].value_before_type_cast
|
41
|
+
return original if original && !original.is_a?(Array)
|
42
42
|
|
43
43
|
instance_variable_set(
|
44
44
|
variable_name,
|
45
|
-
|
46
|
-
if attachment.is_a?(
|
45
|
+
super().map do |attachment|
|
46
|
+
if attachment.is_a?(Integer)
|
47
47
|
Decidim::Attachment.find_by(id: attachment)
|
48
48
|
else
|
49
49
|
attachment
|
@@ -0,0 +1,174 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module AttributeObject
|
5
|
+
# This is the main Form class that provides the functionality for all core
|
6
|
+
# forms that take in user input from the user interface forms and converts
|
7
|
+
# the inputs to expected formats.
|
8
|
+
#
|
9
|
+
# This replaces the Rectify::Form classes in Decidim which used to provide
|
10
|
+
# similar functionality. The API provided by this class is largely
|
11
|
+
# compatible with `Rectify::Form`.
|
12
|
+
class Form
|
13
|
+
include Decidim::AttributeObject::Model
|
14
|
+
include ActiveModel::Validations
|
15
|
+
|
16
|
+
attr_reader :context
|
17
|
+
|
18
|
+
def self.mimic(model_name)
|
19
|
+
@model_name = model_name.to_s.underscore.to_sym
|
20
|
+
end
|
21
|
+
|
22
|
+
def self.mimicked_model_name
|
23
|
+
@model_name || infer_model_name
|
24
|
+
end
|
25
|
+
|
26
|
+
def self.infer_model_name
|
27
|
+
return :form unless name
|
28
|
+
|
29
|
+
class_name = name.split("::").last
|
30
|
+
return :form if class_name == "Form"
|
31
|
+
|
32
|
+
class_name.chomp("Form").underscore.to_sym
|
33
|
+
end
|
34
|
+
|
35
|
+
# Converts the mimicked name to ActiveModel naming.
|
36
|
+
def self.model_name
|
37
|
+
ActiveModel::Name.new(self, nil, mimicked_model_name.to_s)
|
38
|
+
end
|
39
|
+
|
40
|
+
def self.from_model(model)
|
41
|
+
form_attributes = attribute_types.keys.each_with_object({}) do |key, attrs|
|
42
|
+
next unless model.respond_to?(key)
|
43
|
+
|
44
|
+
value = model.send(key)
|
45
|
+
attrs[key] =
|
46
|
+
case value
|
47
|
+
when ActiveStorage::Attached::One
|
48
|
+
value.attachment.try(:blob)
|
49
|
+
when ActiveStorage::Attached::Many
|
50
|
+
value.attachments.map(&:blob)
|
51
|
+
else
|
52
|
+
value
|
53
|
+
end
|
54
|
+
end
|
55
|
+
|
56
|
+
form = new(form_attributes)
|
57
|
+
form.map_model(model)
|
58
|
+
|
59
|
+
form
|
60
|
+
end
|
61
|
+
|
62
|
+
def self.from_params(params, additional_params = {})
|
63
|
+
params_hash = hash_from(params)
|
64
|
+
mimicked_params = ensure_hash(params_hash[mimicked_model_name])
|
65
|
+
|
66
|
+
attributes_hash = params_hash.merge(mimicked_params).merge(additional_params)
|
67
|
+
|
68
|
+
new(attributes_hash)
|
69
|
+
end
|
70
|
+
|
71
|
+
def self.hash_from(params)
|
72
|
+
params = params.to_unsafe_h if params.respond_to?(:to_unsafe_h)
|
73
|
+
params.with_indifferent_access
|
74
|
+
end
|
75
|
+
|
76
|
+
def self.ensure_hash(object)
|
77
|
+
if object.is_a?(Hash)
|
78
|
+
object
|
79
|
+
else
|
80
|
+
{}
|
81
|
+
end
|
82
|
+
end
|
83
|
+
|
84
|
+
def persisted?
|
85
|
+
id.present? && id.to_i.positive?
|
86
|
+
end
|
87
|
+
|
88
|
+
def to_key
|
89
|
+
[id]
|
90
|
+
end
|
91
|
+
|
92
|
+
# Required for the active model naming to work correctly to form the HTML
|
93
|
+
# class attributes for the form elements (e.g. edit_account instead
|
94
|
+
# of edit_account_form).
|
95
|
+
def to_model
|
96
|
+
self
|
97
|
+
end
|
98
|
+
|
99
|
+
def to_param
|
100
|
+
id.to_s
|
101
|
+
end
|
102
|
+
|
103
|
+
# Use the map_model method within the form implementations to map any
|
104
|
+
# custom form-specific attributes from the model to the form.
|
105
|
+
def map_model(_model); end
|
106
|
+
|
107
|
+
def with_context(new_context)
|
108
|
+
@context = if new_context.is_a?(Hash)
|
109
|
+
OpenStruct.new(new_context)
|
110
|
+
else
|
111
|
+
new_context
|
112
|
+
end
|
113
|
+
|
114
|
+
attributes.each do |_name, value|
|
115
|
+
case value
|
116
|
+
when Array
|
117
|
+
value.each do |v|
|
118
|
+
next unless v.respond_to?(:with_context)
|
119
|
+
|
120
|
+
v.with_context(context)
|
121
|
+
end
|
122
|
+
else
|
123
|
+
next unless value.respond_to?(:with_context)
|
124
|
+
|
125
|
+
value.with_context(context)
|
126
|
+
end
|
127
|
+
end
|
128
|
+
|
129
|
+
self
|
130
|
+
end
|
131
|
+
|
132
|
+
# Although we are running the nested attributes validations through the
|
133
|
+
# NestedValidator, we still need to check for the errors in the nested
|
134
|
+
# attributes after the main validations are run in case the main
|
135
|
+
# validations are adding errors to some of the nested attributes.
|
136
|
+
#
|
137
|
+
# An example of such form is the Decidim::Budgets::Admin::ComponentForm
|
138
|
+
# which adds errors to the sub-attribute "settings" during its own
|
139
|
+
# validations. Because these errors are not added to the main form object,
|
140
|
+
# the main form object would be interpreted as valid without checking the
|
141
|
+
# sub-attribute validations.
|
142
|
+
#
|
143
|
+
# This preserves the backwards compatibility with Rectify::Form which
|
144
|
+
# did the validations in this order and fails the main record validation
|
145
|
+
# in case one of the nested attributes is not valid. This is needed e.g.
|
146
|
+
# for the customized component validations (e.g. Budgets component form).
|
147
|
+
def valid?(_context = nil)
|
148
|
+
super && self.class.attribute_types.none? do |name, type|
|
149
|
+
value = public_send(name)
|
150
|
+
|
151
|
+
if value.is_a?(Decidim::AttributeObject::Model) || (type.respond_to?(:validate_nested?) && type.validate_nested?)
|
152
|
+
_value_has_errors?(value)
|
153
|
+
else
|
154
|
+
false
|
155
|
+
end
|
156
|
+
end
|
157
|
+
end
|
158
|
+
|
159
|
+
private
|
160
|
+
|
161
|
+
def _value_has_errors?(value)
|
162
|
+
if value.is_a?(Array)
|
163
|
+
value.any? { |v| _value_has_errors?(v) }
|
164
|
+
elsif value.is_a?(Hash)
|
165
|
+
_value_has_errors?(value.values)
|
166
|
+
elsif value.respond_to?(:errors)
|
167
|
+
value.errors.any?
|
168
|
+
else
|
169
|
+
false
|
170
|
+
end
|
171
|
+
end
|
172
|
+
end
|
173
|
+
end
|
174
|
+
end
|