decidim-core 0.23.6 → 0.24.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 +2 -2
- data/app/assets/images/decidim/icons.svg +1 -1
- data/app/assets/javascripts/decidim/core/bundle.js +1 -1
- data/app/assets/javascripts/decidim/core/bundle.js.map +1 -1
- data/app/assets/javascripts/decidim/editor/history_override.js.es6 +117 -0
- data/app/assets/javascripts/decidim/editor/linebreak_module.js.es6 +83 -0
- data/app/assets/javascripts/decidim/editor/modified_backspace_offset1.js.es6 +98 -0
- data/app/assets/javascripts/decidim/editor/modified_backspace_offset_any.js.es6 +48 -0
- data/app/assets/javascripts/decidim/editor/modified_backspace_utils.js.es6 +31 -0
- data/app/assets/javascripts/decidim/editor/modified_enter.js.es6 +118 -0
- data/app/assets/javascripts/decidim/editor.js.es6 +15 -4
- data/app/assets/javascripts/decidim/form_filter.component.js.es6 +25 -0
- data/app/assets/javascripts/decidim/geocoding/attach_input.js.es6 +41 -4
- data/app/assets/javascripts/decidim/input_character_counter.js.es6 +6 -1
- data/app/assets/javascripts/decidim/map/controller/markers.js.es6 +27 -9
- data/app/assets/javascripts/decidim/session_timeouter.js.es6 +78 -0
- data/app/assets/javascripts/decidim.js.es6 +1 -0
- data/app/assets/stylesheets/decidim/_variables.scss +9 -0
- data/app/assets/stylesheets/decidim/email.scss +14 -2
- data/app/assets/stylesheets/decidim/extras/_external-links.scss +0 -1
- data/app/assets/stylesheets/decidim/extras/_process_stats.scss +1 -1
- data/app/assets/stylesheets/decidim/extras/_results-per-page.scss +1 -0
- data/app/assets/stylesheets/decidim/modules/_author-avatar.scss +2 -2
- data/app/assets/stylesheets/decidim/modules/_buttons.scss +2 -2
- data/app/assets/stylesheets/decidim/modules/_cards.scss +18 -1
- data/app/assets/stylesheets/decidim/modules/_collapsible-list.scss +1 -1
- data/app/assets/stylesheets/decidim/modules/_comments.scss +5 -1
- data/app/assets/stylesheets/decidim/modules/_conference-speaker.scss +4 -3
- data/app/assets/stylesheets/decidim/modules/_data-picker.scss +7 -0
- data/app/assets/stylesheets/decidim/modules/_extra.scss +4 -0
- data/app/assets/stylesheets/decidim/modules/_forms.scss +4 -0
- data/app/assets/stylesheets/decidim/modules/_loading-spinner.scss +34 -0
- data/app/assets/stylesheets/decidim/modules/_modules.scss +1 -1
- data/app/assets/stylesheets/decidim/modules/_opinion-toggle.scss +1 -1
- data/app/assets/stylesheets/decidim/modules/_reveal.scss +6 -0
- data/app/assets/stylesheets/decidim/modules/_signup.scss +1 -0
- data/app/assets/stylesheets/decidim/modules/{_process-stats.scss → _space-stats.scss} +1 -1
- data/app/cells/decidim/activity/show.erb +1 -1
- data/app/cells/decidim/activity_cell.rb +11 -14
- data/app/cells/decidim/address/details.erb +5 -5
- data/app/cells/decidim/address_cell.rb +0 -21
- data/app/cells/decidim/announcement/show.erb +4 -4
- data/app/cells/decidim/announcement_cell.rb +22 -2
- data/app/cells/decidim/author/flag_user.erb +10 -0
- data/app/cells/decidim/author/profile_minicard.erb +1 -1
- data/app/cells/decidim/author_cell.rb +9 -1
- data/app/cells/decidim/card_m/top.erb +1 -1
- data/app/cells/decidim/card_m_cell.rb +1 -1
- data/app/cells/decidim/content_blocks/cta/show.erb +14 -0
- data/app/cells/decidim/content_blocks/cta_cell.rb +35 -0
- data/app/cells/decidim/content_blocks/cta_settings_form/show.erb +9 -0
- data/app/cells/decidim/content_blocks/cta_settings_form_cell.rb +13 -0
- data/app/cells/decidim/content_blocks/hero_cell.rb +14 -0
- data/app/cells/decidim/content_blocks/highlighted_elements/elements.erb +0 -0
- data/app/cells/decidim/content_blocks/highlighted_elements/heading.erb +0 -0
- data/app/cells/decidim/content_blocks/highlighted_elements/show.erb +4 -0
- data/app/cells/decidim/content_blocks/highlighted_elements_cell.rb +51 -0
- data/app/cells/decidim/content_blocks/highlighted_elements_settings_form/show.erb +3 -0
- data/app/cells/decidim/content_blocks/highlighted_elements_settings_form_cell.rb +28 -0
- data/app/cells/decidim/content_blocks/last_activity_cell.rb +11 -0
- data/app/cells/decidim/content_blocks/metrics_cell.rb +0 -6
- data/app/cells/decidim/content_blocks/stats_cell.rb +0 -6
- data/app/cells/decidim/date/show.erb +31 -0
- data/app/cells/decidim/date_cell.rb +50 -0
- data/app/cells/decidim/endorsement_buttons_cell.rb +3 -3
- data/app/cells/decidim/flag_modal/flag_user.erb +24 -0
- data/app/cells/decidim/flag_modal/show.erb +24 -0
- data/app/cells/decidim/flag_modal_cell.rb +25 -0
- data/app/cells/decidim/profile/inaccessible.erb +9 -0
- data/app/cells/decidim/profile_cell.rb +9 -1
- data/app/cells/decidim/profile_sidebar/show.erb +10 -1
- data/app/cells/decidim/profile_sidebar_cell.rb +1 -0
- data/app/cells/decidim/reported_content/show.erb +5 -0
- data/app/cells/decidim/reported_content_cell.rb +44 -0
- data/app/cells/decidim/scopes_picker/scope_picker_prompt.erb +3 -0
- data/app/cells/decidim/scopes_picker/scope_picker_values.erb +5 -0
- data/app/cells/decidim/scopes_picker/show.erb +14 -0
- data/app/cells/decidim/scopes_picker_cell.rb +93 -0
- data/app/cells/decidim/tos_page/announcement.erb +1 -1
- data/app/cells/decidim/tos_page/form.erb +15 -13
- data/app/cells/decidim/tos_page_cell.rb +10 -8
- data/app/cells/decidim/translation_bar_cell.rb +1 -1
- data/app/cells/decidim/user_conversation/conversation_header.erb +1 -1
- data/app/cells/decidim/user_conversations_cell.rb +1 -1
- data/app/commands/decidim/create_report.rb +11 -1
- data/app/commands/decidim/create_user_report.rb +67 -0
- data/app/commands/decidim/destroy_account.rb +0 -2
- data/app/commands/decidim/gallery_methods.rb +2 -2
- data/app/commands/decidim/multiple_attachments_methods.rb +14 -10
- data/app/commands/decidim/search.rb +5 -2
- data/app/commands/decidim/update_notifications_settings.rb +1 -0
- data/app/commands/decidim/update_user_group.rb +1 -0
- data/app/controllers/concerns/decidim/devise_controllers.rb +1 -1
- data/app/controllers/concerns/decidim/flaggable.rb +5 -1
- data/app/controllers/concerns/decidim/force_authentication.rb +11 -3
- data/app/controllers/concerns/decidim/locale_switcher.rb +5 -0
- data/app/controllers/concerns/decidim/needs_permission.rb +7 -1
- data/app/controllers/concerns/decidim/orderable.rb +3 -1
- data/app/controllers/concerns/decidim/user_blocked_checker.rb +26 -0
- data/app/controllers/decidim/application_controller.rb +22 -0
- data/app/controllers/decidim/devise/omniauth_registrations_controller.rb +3 -1
- data/app/controllers/decidim/devise/sessions_controller.rb +10 -6
- data/app/controllers/decidim/errors_controller.rb +1 -1
- data/app/controllers/decidim/locales_controller.rb +1 -1
- data/app/controllers/decidim/profiles_controller.rb +6 -0
- data/app/controllers/decidim/report_users_controller.rb +42 -0
- data/app/controllers/decidim/scopes_controller.rb +19 -10
- data/app/controllers/decidim/timeouts_controller.rb +28 -0
- data/app/controllers/decidim/user_activities_controller.rb +5 -0
- data/app/controllers/decidim/user_timeline_controller.rb +1 -0
- data/app/events/decidim/demoted_membership_event.rb +2 -2
- data/app/events/decidim/invited_to_group_event.rb +2 -2
- data/app/events/decidim/join_request_accepted_event.rb +2 -2
- data/app/events/decidim/join_request_created_event.rb +2 -2
- data/app/events/decidim/join_request_rejected_event.rb +2 -2
- data/app/events/decidim/promoted_to_admin_event.rb +2 -2
- data/app/events/decidim/removed_from_group_event.rb +2 -2
- data/app/forms/decidim/account_form.rb +2 -2
- data/app/forms/decidim/invite_user_form.rb +2 -2
- data/app/forms/decidim/messaging/conversation_form.rb +1 -1
- data/app/forms/decidim/messaging/message_form.rb +1 -1
- data/app/forms/decidim/notifications_settings_form.rb +20 -0
- data/app/forms/url_validator.rb +20 -0
- data/app/helpers/decidim/action_authorization_helper.rb +2 -0
- data/app/helpers/decidim/application_helper.rb +1 -3
- data/app/helpers/decidim/cells_helper.rb +6 -0
- data/app/helpers/decidim/filters_helper.rb +9 -0
- data/app/helpers/decidim/messaging/conversation_helper.rb +11 -1
- data/app/helpers/decidim/newsletters_helper.rb +7 -9
- data/app/helpers/decidim/scopes_helper.rb +1 -1
- data/app/jobs/decidim/block_user_job.rb +11 -0
- data/app/jobs/decidim/export_job.rb +2 -2
- data/app/jobs/decidim/find_and_update_descendants_job.rb +48 -0
- data/app/jobs/decidim/machine_translation_resource_job.rb +3 -0
- data/app/jobs/decidim/machine_translation_save_job.rb +29 -0
- data/app/jobs/decidim/update_search_indexes_job.rb +11 -0
- data/app/jobs/decidim/user_report_job.rb +11 -0
- data/app/mailers/decidim/block_user_mailer.rb +21 -0
- data/app/mailers/decidim/reported_mailer.rb +33 -3
- data/app/mailers/decidim/user_report_mailer.rb +21 -0
- data/app/models/decidim/area.rb +0 -1
- data/app/models/decidim/area_type.rb +1 -1
- data/app/models/decidim/attachment.rb +3 -2
- data/app/models/decidim/attachment_collection.rb +1 -1
- data/app/models/decidim/authorization.rb +4 -0
- data/app/models/decidim/category.rb +6 -1
- data/app/models/decidim/impersonation_log.rb +5 -7
- data/app/models/decidim/metric.rb +2 -2
- data/app/models/decidim/moderation.rb +12 -0
- data/app/models/decidim/organization.rb +5 -1
- data/app/models/decidim/scope.rb +5 -2
- data/app/models/decidim/scope_type.rb +1 -1
- data/app/models/decidim/share_token.rb +1 -1
- data/app/models/decidim/static_page.rb +11 -1
- data/app/models/decidim/static_page_topic.rb +4 -0
- data/app/models/decidim/user.rb +13 -8
- data/app/models/decidim/user_base_entity.rb +13 -13
- data/app/models/decidim/user_block.rb +10 -0
- data/app/models/decidim/user_group.rb +1 -4
- data/app/models/decidim/user_moderation.rb +22 -0
- data/app/models/decidim/user_report.rb +31 -0
- data/app/permissions/decidim/permissions.rb +1 -3
- data/app/permissions/decidim/report_user_permissions.rb +13 -0
- data/app/presenters/decidim/admin_log/impersonation_log_presenter.rb +39 -0
- data/app/presenters/decidim/admin_log/organization_presenter.rb +1 -2
- data/app/presenters/decidim/admin_log/user_moderation_presenter.rb +63 -0
- data/app/presenters/decidim/admin_log/user_presenter.rb +18 -9
- data/app/presenters/decidim/home_stats_presenter.rb +3 -3
- data/app/presenters/decidim/log/diff_presenter.rb +4 -3
- data/app/presenters/decidim/log/resource_presenter.rb +4 -4
- data/app/presenters/decidim/log/user_presenter.rb +1 -1
- data/app/presenters/decidim/menu_presenter.rb +12 -7
- data/app/presenters/decidim/nil_presenter.rb +0 -2
- data/app/presenters/decidim/user_presenter.rb +1 -1
- data/app/queries/decidim/metrics/blocked_users_metric_manage.rb +26 -0
- data/app/queries/decidim/metrics/followers_metric_manage.rb +3 -0
- data/app/queries/decidim/metrics/participants_metric_manage.rb +3 -0
- data/app/queries/decidim/metrics/reported_users_metric_manage.rb +26 -0
- data/app/queries/decidim/metrics/user_reports_metric_manage.rb +26 -0
- data/app/queries/decidim/user_groups/accepted_memberships.rb +1 -1
- data/app/queries/decidim/user_groups/admin_memberships.rb +1 -1
- data/app/queries/decidim/user_groups/member_memberships.rb +1 -1
- data/app/services/decidim/activity_search.rb +1 -3
- data/app/services/decidim/base_diff_renderer.rb +1 -1
- data/app/services/decidim/data_portability_exporter.rb +1 -0
- data/app/services/decidim/email_notification_generator.rb +2 -2
- data/app/services/decidim/events_manager.rb +1 -1
- data/app/services/decidim/open_data_exporter.rb +36 -7
- data/app/services/decidim/zip_stream/zip_stream_writer.rb +3 -3
- data/app/uploaders/decidim/application_uploader.rb +22 -2
- data/app/uploaders/decidim/attachment_uploader.rb +2 -4
- data/app/uploaders/decidim/downloader.rb +9 -0
- data/app/uploaders/decidim/image_uploader.rb +9 -21
- data/app/uploaders/decidim/open_data_uploader.rb +5 -0
- data/app/uploaders/decidim/record_image_uploader.rb +2 -2
- data/app/validators/etiquette_validator.rb +0 -7
- data/app/validators/uploader_content_type_validator.rb +4 -2
- data/app/views/decidim/application/_document.html.erb +1 -1
- data/app/views/decidim/block_user_mailer/notify.html.erb +7 -0
- data/app/views/decidim/devise/confirmations/new.html.erb +1 -1
- data/app/views/decidim/devise/registrations/edit.html.erb +1 -1
- data/app/views/decidim/devise/unlocks/new.html.erb +1 -1
- data/app/views/decidim/messaging/conversations/_conversation.html.erb +1 -1
- data/app/views/decidim/messaging/conversations/_messages.html.erb +1 -1
- data/app/views/decidim/messaging/conversations/_show.html.erb +4 -4
- data/app/views/decidim/notifications_settings/show.html.erb +11 -0
- data/app/views/decidim/pages/_standalone.html.erb +3 -1
- data/app/views/decidim/reported_mailer/report.html.erb +9 -17
- data/app/views/decidim/shared/_check_boxes_tree.html.erb +3 -3
- data/app/views/decidim/shared/_component_announcement.html.erb +2 -2
- data/app/views/decidim/shared/participatory_space_filters/_filters.html.erb +1 -1
- data/app/views/decidim/user_report_mailer/notify.html.erb +7 -0
- data/app/views/decidim/widgets/_data_picker.html.erb +1 -1
- data/app/views/layouts/decidim/_application.html.erb +1 -0
- data/app/views/layouts/decidim/_js_configuration.html.erb +1 -1
- data/app/views/layouts/decidim/_main_footer.html.erb +6 -4
- data/app/views/layouts/decidim/_timeout_modal.html.erb +21 -0
- data/config/initializers/active_support.rb +7 -0
- data/config/initializers/devise.rb +1 -1
- data/config/initializers/omniauth.rb +1 -1
- data/config/locales/ar.yml +1 -7
- data/config/locales/bg.yml +1 -13
- data/config/locales/ca.yml +46 -17
- data/config/locales/cs.yml +118 -53
- data/config/locales/de.yml +83 -18
- data/config/locales/el.yml +1 -14
- data/config/locales/en.yml +79 -14
- data/config/locales/eo.yml +0 -1
- data/config/locales/es-MX.yml +31 -14
- data/config/locales/es-PY.yml +31 -14
- data/config/locales/es.yml +34 -17
- data/config/locales/eu.yml +4 -10
- data/config/locales/fi-plain.yml +80 -16
- data/config/locales/fi.yml +85 -21
- data/config/locales/fr-CA.yml +79 -14
- data/config/locales/fr.yml +76 -11
- data/config/locales/gl.yml +1 -15
- data/config/locales/hu.yml +1 -12
- data/config/locales/id-ID.yml +1 -7
- data/config/locales/is-IS.yml +0 -9
- data/config/locales/it.yml +72 -19
- data/config/locales/ja.yml +1 -14
- data/config/locales/lv.yml +1 -12
- data/config/locales/nl.yml +38 -13
- data/config/locales/no.yml +7 -14
- data/config/locales/pl.yml +81 -14
- data/config/locales/pt-BR.yml +1 -7
- data/config/locales/pt.yml +1 -14
- data/config/locales/ro-RO.yml +15 -25
- data/config/locales/ru.yml +7 -12
- data/config/locales/sk.yml +2 -13
- data/config/locales/sr-CS.yml +0 -9
- data/config/locales/sv.yml +5 -27
- data/config/locales/tr-TR.yml +65 -14
- data/config/locales/uk.yml +7 -9
- data/config/locales/zh-CN.yml +1 -14
- data/config/routes.rb +9 -4
- data/db/migrate/20170713131206_add_admin_to_users.rb +1 -1
- data/db/migrate/20180206143340_fix_reference_for_all_resources.rb +2 -0
- data/db/migrate/20180314085339_rename_maximum_votes_per_proposal_to_threshold_per_proposal.rb +2 -2
- data/db/migrate/20200929171508_remove_show_statistics_from_organizations.rb +7 -0
- data/db/migrate/20201010124755_create_decidim_user_moderations.rb +12 -0
- data/db/migrate/20201010124756_create_decidim_user_reports.rb +16 -0
- data/db/migrate/20201010224433_add_suspension_fields_to_decidim_users.rb +8 -0
- data/db/migrate/20201011074641_create_decidim_user_suspensions.rb +14 -0
- data/db/migrate/20201011081626_add_current_suspension_id_to_decidim_users.rb +7 -0
- data/db/migrate/20201013071533_add_reported_content_to_moderations.rb +7 -0
- data/db/migrate/20201019074554_add_locale_to_moderation_reports.rb +7 -0
- data/db/migrate/20201127114444_encrypt_authorization_metadatas.rb +35 -0
- data/db/migrate/20201128130723_add_allow_public_access_to_static_pages.rb +17 -0
- data/db/migrate/20201218144706_update_table_block_user_functionality.rb +8 -0
- data/db/migrate/20201218145252_rename_decidim_user_fields_for_block_functionality.rb +9 -0
- data/db/migrate/20210208134328_add_email_on_moderations_to_users.rb +7 -0
- data/db/seeds.rb +14 -13
- data/lib/decidim/amendable.rb +3 -2
- data/{app/functions/decidim/core → lib/decidim/api/functions}/component_finder_base.rb +1 -1
- data/{app/functions/decidim/core → lib/decidim/api/functions}/component_list.rb +4 -4
- data/{app/functions/decidim/core → lib/decidim/api/functions}/component_list_base.rb +3 -1
- data/lib/decidim/api/functions/needs_api_default_order.rb +24 -0
- data/{app/functions/decidim/core → lib/decidim/api/functions}/needs_api_filter_and_order.rb +0 -0
- data/{app/functions/decidim/core → lib/decidim/api/functions}/participatory_space_finder_base.rb +2 -2
- data/{app/functions/decidim/core → lib/decidim/api/functions}/participatory_space_list_base.rb +3 -1
- data/{app/functions/decidim/core → lib/decidim/api/functions}/user_entity_finder.rb +1 -4
- data/{app/functions/decidim/core → lib/decidim/api/functions}/user_entity_list.rb +1 -3
- data/{app/types/decidim/core → lib/decidim/api/input_filters}/base_input_filter.rb +0 -0
- data/{app/types/decidim/core → lib/decidim/api/input_filters}/component_input_filter.rb +20 -22
- data/{app/types/decidim/core → lib/decidim/api/input_filters}/has_hastaggable_input_filter.rb +1 -1
- data/{app/types/decidim/core → lib/decidim/api/input_filters}/has_localized_input_filter.rb +3 -3
- data/{app/types/decidim/core → lib/decidim/api/input_filters}/has_publishable_input_filter.rb +6 -6
- data/{app/types/decidim/core → lib/decidim/api/input_filters}/has_timestamp_input_filter.rb +12 -12
- data/{app/types/decidim/core → lib/decidim/api/input_filters}/participatory_space_input_filter.rb +0 -1
- data/lib/decidim/api/input_filters/user_entity_input_filter.rb +89 -0
- data/{app/types/decidim/core → lib/decidim/api/input_sorts}/base_input_sort.rb +3 -2
- data/{app/types/decidim/core → lib/decidim/api/input_sorts}/component_input_sort.rb +10 -11
- data/{app/types/decidim/core → lib/decidim/api/input_sorts}/has_endorsable_input_sort.rb +2 -4
- data/{app/types/decidim/core → lib/decidim/api/input_sorts}/has_localized_input_sort.rb +3 -3
- data/{app/types/decidim/core → lib/decidim/api/input_sorts}/has_publishable_input_sort.rb +1 -1
- data/lib/decidim/api/input_sorts/has_timestamp_input_sort.rb +12 -0
- data/{app/types/decidim/core → lib/decidim/api/input_sorts}/participatory_space_input_sort.rb +1 -1
- data/{app/types/decidim/core → lib/decidim/api/input_sorts}/user_entity_input_sort.rb +4 -4
- data/lib/decidim/api/{amendable_entity_interface.rb → interfaces/amendable_entity_interface.rb} +5 -5
- data/lib/decidim/api/interfaces/amendable_interface.rb +17 -0
- data/lib/decidim/api/{attachable_interface.rb → interfaces/attachable_interface.rb} +3 -3
- data/lib/decidim/api/interfaces/author_interface.rb +32 -0
- data/lib/decidim/api/interfaces/authorable_interface.rb +23 -0
- data/lib/decidim/api/{categorizable_interface.rb → interfaces/categorizable_interface.rb} +3 -3
- data/lib/decidim/api/interfaces/coauthorable_interface.rb +30 -0
- data/lib/decidim/api/interfaces/component_interface.rb +22 -0
- data/lib/decidim/api/interfaces/endorsable_interface.rb +19 -0
- data/lib/decidim/api/{fingerprint_interface.rb → interfaces/fingerprint_interface.rb} +3 -3
- data/lib/decidim/api/interfaces/participatory_space_interface.rb +48 -0
- data/lib/decidim/api/interfaces/participatory_space_resourceable_interface.rb +25 -0
- data/lib/decidim/api/{scopable_interface.rb → interfaces/scopable_interface.rb} +3 -3
- data/lib/decidim/api/interfaces/timestamps_interface.rb +15 -0
- data/lib/decidim/api/interfaces/traceable_interface.rb +14 -0
- data/lib/decidim/api/scalars/date_time_type.rb +17 -0
- data/lib/decidim/api/scalars/date_type.rb +17 -0
- data/lib/decidim/api/types/amendment_type.rb +19 -0
- data/lib/decidim/api/types/area_api_type.rb +16 -0
- data/lib/decidim/api/types/area_type_type.rb +13 -0
- data/lib/decidim/api/types/attachment_type.rb +13 -0
- data/lib/decidim/api/types/category_type.rb +14 -0
- data/{app/types/decidim/core → lib/decidim/api/types}/component_type.rb +2 -4
- data/lib/decidim/api/types/coordinates_type.rb +21 -0
- data/lib/decidim/api/types/decidim_type.rb +13 -0
- data/lib/decidim/api/types/fingerprint_type.rb +12 -0
- data/lib/decidim/api/types/hashtag_type.rb +13 -0
- data/lib/decidim/api/types/localized_string_type.rb +13 -0
- data/lib/decidim/api/types/metric_history_type.rb +18 -0
- data/lib/decidim/api/types/metric_type.rb +13 -0
- data/lib/decidim/api/types/organization_type.rb +17 -0
- data/lib/decidim/api/types/participatory_space_link_type.rb +22 -0
- data/lib/decidim/api/types/participatory_space_type.rb +10 -0
- data/lib/decidim/api/types/scope_api_type.rb +16 -0
- data/lib/decidim/api/types/session_type.rb +22 -0
- data/lib/decidim/api/types/statistic_type.rb +20 -0
- data/lib/decidim/api/types/trace_version_type.rb +21 -0
- data/lib/decidim/api/types/translated_field_type.rb +36 -0
- data/lib/decidim/api/types/user_group_type.rb +64 -0
- data/lib/decidim/api/types/user_type.rb +67 -0
- data/lib/decidim/attachment_attributes.rb +57 -0
- data/lib/decidim/attributes/clean_string.rb +37 -0
- data/lib/decidim/attributes.rb +1 -0
- data/lib/decidim/coauthorable.rb +3 -3
- data/lib/decidim/component_manifest.rb +17 -0
- data/lib/decidim/content_block_manifest.rb +1 -1
- data/lib/decidim/content_parsers/hashtag_parser.rb +3 -6
- data/lib/decidim/content_parsers/user_group_parser.rb +2 -5
- data/lib/decidim/content_parsers/user_parser.rb +2 -5
- data/lib/decidim/content_processor.rb +1 -1
- data/lib/decidim/content_renderers/hashtag_renderer.rb +3 -6
- data/lib/decidim/core/api.rb +71 -16
- data/lib/decidim/core/engine.rb +35 -6
- data/lib/decidim/core/test/factories.rb +53 -15
- data/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/amendable/amendment_accepted_event_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/amendable/amendment_promoted_event_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/amendable/amendment_rejected_event_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/categorizable_interface_examples.rb +6 -14
- data/lib/decidim/core/test/shared_examples/comments_examples.rb +11 -9
- data/lib/decidim/core/test/shared_examples/component_type.rb +1 -1
- data/lib/decidim/core/test/shared_examples/controller_render_views.rb +28 -0
- data/lib/decidim/core/test/shared_examples/follows_examples.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 +1 -1
- data/lib/decidim/core/test/shared_examples/process_announcements_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/reportable.rb +8 -0
- data/lib/decidim/core/test/shared_examples/rich_text_editor_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/searchable_participatory_space_examples.rb +2 -3
- data/lib/decidim/core/test/shared_examples/searchable_results_examples.rb +46 -0
- data/lib/decidim/core/test/shared_examples/static_pages_examples.rb +43 -0
- data/lib/decidim/core/test.rb +2 -0
- data/lib/decidim/core/version.rb +1 -1
- data/lib/decidim/core.rb +11 -3
- data/lib/decidim/diffy_extension.rb +2 -2
- data/lib/decidim/exporters/csv.rb +3 -2
- data/lib/decidim/exporters/export_data.rb +1 -1
- data/lib/decidim/faker/internet.rb +17 -0
- data/lib/decidim/faker/localized.rb +43 -20
- data/lib/decidim/file_validator_humanizer.rb +6 -4
- data/lib/decidim/form_builder.rb +33 -22
- data/lib/decidim/gamification/badge_scorer.rb +3 -2
- data/lib/decidim/gamification/base_event.rb +2 -2
- data/lib/decidim/geocodable.rb +2 -0
- data/lib/decidim/has_category.rb +1 -1
- data/lib/decidim/has_private_users.rb +1 -1
- data/lib/decidim/importers/import_manifest.rb +36 -0
- data/lib/decidim/map/autocomplete.rb +11 -1
- data/lib/decidim/metric_operation.rb +5 -6
- data/lib/decidim/participatory_space_resourceable.rb +1 -3
- data/lib/decidim/query_extensions.rb +90 -69
- data/lib/decidim/randomable.rb +6 -1
- data/lib/decidim/record_encryptor.rb +131 -0
- data/lib/decidim/reportable.rb +26 -0
- data/lib/decidim/resource_manifest.rb +3 -0
- data/lib/decidim/resourceable.rb +6 -6
- data/lib/decidim/scopable.rb +1 -1
- data/lib/decidim/search_resource_fields_mapper.rb +1 -1
- data/lib/decidim/searchable.rb +9 -0
- data/lib/decidim/settings_manifest.rb +2 -1
- data/lib/decidim/shareable_with_token.rb +0 -1
- data/lib/decidim/translatable_attributes.rb +2 -1
- data/lib/decidim/translatable_resource.rb +10 -0
- data/lib/decidim/user_reportable.rb +33 -0
- data/lib/decidim/view_model.rb +26 -0
- data/lib/premailer/adapter/decidim.rb +4 -4
- data/lib/tasks/decidim_data_portability_tasks.rake +4 -4
- data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.ko.js +18 -0
- data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.vi.js +14 -0
- data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.zh-CN.js +14 -0
- data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.zh-TW.js +14 -0
- metadata +190 -95
- data/app/functions/decidim/core/participatory_space_finder.rb +0 -11
- data/app/functions/decidim/core/participatory_space_list.rb +0 -11
- data/app/helpers/decidim/cache_helper.rb +0 -14
- data/app/types/decidim/core/amendment_type.rb +0 -26
- data/app/types/decidim/core/area_api_type.rb +0 -16
- data/app/types/decidim/core/area_type_type.rb +0 -14
- data/app/types/decidim/core/attachment_type.rb +0 -14
- data/app/types/decidim/core/category_type.rb +0 -16
- data/app/types/decidim/core/coordinates_type.rb +0 -19
- data/app/types/decidim/core/date_time_type.rb +0 -12
- data/app/types/decidim/core/date_type.rb +0 -13
- data/app/types/decidim/core/decidim_type.rb +0 -19
- data/app/types/decidim/core/fingerprint_type.rb +0 -15
- data/app/types/decidim/core/has_timestamp_input_sort.rb +0 -12
- data/app/types/decidim/core/hashtag_type.rb +0 -13
- data/app/types/decidim/core/localized_string_type.rb +0 -14
- data/app/types/decidim/core/metric_history_type.rb +0 -17
- data/app/types/decidim/core/metric_type.rb +0 -14
- data/app/types/decidim/core/organization_type.rb +0 -20
- data/app/types/decidim/core/participatory_space_link_type.rb +0 -24
- data/app/types/decidim/core/participatory_space_type.rb +0 -12
- data/app/types/decidim/core/scope_api_type.rb +0 -16
- data/app/types/decidim/core/session_type.rb +0 -19
- data/app/types/decidim/core/statistic_type.rb +0 -22
- data/app/types/decidim/core/trace_version_type.rb +0 -29
- data/app/types/decidim/core/translated_field_type.rb +0 -45
- data/app/types/decidim/core/user_entity_input_filter.rb +0 -81
- data/app/types/decidim/core/user_group_type.rb +0 -51
- data/app/types/decidim/core/user_type.rb +0 -52
- data/app/views/decidim/shared/_announcement.html.erb +0 -1
- data/app/views/decidim/shared/_flag_modal.html.erb +0 -20
- data/db/migrate/20210302150803_invalidate_all_sessions_for_deleted_users.rb +0 -11
- data/lib/decidim/api/amendable_interface.rb +0 -18
- data/lib/decidim/api/author_interface.rb +0 -29
- data/lib/decidim/api/authorable_interface.rb +0 -22
- data/lib/decidim/api/coauthorable_interface.rb +0 -29
- data/lib/decidim/api/component_interface.rb +0 -20
- data/lib/decidim/api/endorsable_interface.rb +0 -22
- data/lib/decidim/api/participatory_space_interface.rb +0 -47
- data/lib/decidim/api/participatory_space_resourceable_interface.rb +0 -21
- data/lib/decidim/api/timestamps_interface.rb +0 -21
- data/lib/decidim/api/traceable_interface.rb +0 -14
@@ -53,12 +53,13 @@ module Decidim
|
|
53
53
|
end
|
54
54
|
|
55
55
|
def flatten(object, key = nil)
|
56
|
-
|
56
|
+
case object
|
57
|
+
when Hash
|
57
58
|
object.inject({}) do |result, (subkey, value)|
|
58
59
|
new_key = key ? "#{key}/#{subkey}" : subkey.to_s
|
59
60
|
result.merge(flatten(value, new_key))
|
60
61
|
end
|
61
|
-
|
62
|
+
when Array
|
62
63
|
{ key.to_s => object.compact.map(&:to_s).join(", ") }
|
63
64
|
else
|
64
65
|
{ key.to_s => object }
|
@@ -28,7 +28,7 @@ module Decidim
|
|
28
28
|
# Returns a String with the filename of the export.
|
29
29
|
def filename(prefix = "export", options = {})
|
30
30
|
options[:extension] = !options[:extension].nil? ? options[:extension] : true
|
31
|
-
result = "#{prefix}-#{I18n.
|
31
|
+
result = "#{prefix}-#{I18n.l(Time.zone.today, format: :default)}-#{Time.now.seconds_since_midnight.to_i}"
|
32
32
|
result += ".#{extension}" if options[:extension]
|
33
33
|
result
|
34
34
|
end
|
@@ -0,0 +1,17 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "faker"
|
4
|
+
|
5
|
+
module Decidim
|
6
|
+
module Faker
|
7
|
+
# A Custom Faker wrapper to modify Faker::Internet#slug
|
8
|
+
class Internet < ::Faker::Internet
|
9
|
+
# Fakes a slug, using EN locale to allow ASCII only
|
10
|
+
def self.slug(...)
|
11
|
+
with_locale(:en) do
|
12
|
+
::Faker::Internet.slug(...)
|
13
|
+
end
|
14
|
+
end
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
@@ -46,9 +46,9 @@ module Decidim
|
|
46
46
|
# Builds many Lorem Ipsum words. See Faker::Lorem for options.
|
47
47
|
#
|
48
48
|
# Returns a Hash with a value for each locale.
|
49
|
-
def self.words(
|
49
|
+
def self.words(...)
|
50
50
|
localized do
|
51
|
-
::Faker::Lorem.words(
|
51
|
+
::Faker::Lorem.words(...)
|
52
52
|
end
|
53
53
|
end
|
54
54
|
|
@@ -64,63 +64,63 @@ module Decidim
|
|
64
64
|
# Builds many Lorem Ipsum characters. See Faker::Lorem for options.
|
65
65
|
#
|
66
66
|
# Returns a Hash with a value for each locale.
|
67
|
-
def self.characters(
|
67
|
+
def self.characters(...)
|
68
68
|
localized do
|
69
|
-
::Faker::Lorem.characters(
|
69
|
+
::Faker::Lorem.characters(...)
|
70
70
|
end
|
71
71
|
end
|
72
72
|
|
73
73
|
# Builds a sentence with Lorem Ipsum words. See Faker::Lorem for options.
|
74
74
|
#
|
75
75
|
# Returns a Hash with a value for each locale.
|
76
|
-
def self.sentence(
|
76
|
+
def self.sentence(...)
|
77
77
|
localized do
|
78
|
-
::Faker::Lorem.sentence(
|
78
|
+
::Faker::Lorem.sentence(...)
|
79
79
|
end
|
80
80
|
end
|
81
81
|
|
82
82
|
# Builds many sentences with Lorem Ipsum words. See Faker::Lorem for options.
|
83
83
|
#
|
84
84
|
# Returns a Hash with a value for each locale.
|
85
|
-
def self.sentences(
|
85
|
+
def self.sentences(...)
|
86
86
|
localized do
|
87
|
-
::Faker::Lorem.sentences(
|
87
|
+
::Faker::Lorem.sentences(...)
|
88
88
|
end
|
89
89
|
end
|
90
90
|
|
91
91
|
# Builds a paragraph with Lorem Ipsum words. See Faker::Lorem for options.
|
92
92
|
#
|
93
93
|
# Returns a Hash with a value for each locale.
|
94
|
-
def self.paragraph(
|
94
|
+
def self.paragraph(...)
|
95
95
|
localized do
|
96
|
-
::Faker::Lorem.paragraph(
|
96
|
+
::Faker::Lorem.paragraph(...)
|
97
97
|
end
|
98
98
|
end
|
99
99
|
|
100
100
|
# Builds many paragraphs with Lorem Ipsum words. See Faker::Lorem for options.
|
101
101
|
#
|
102
102
|
# Returns a Hash with a value for each locale.
|
103
|
-
def self.paragraphs(
|
103
|
+
def self.paragraphs(...)
|
104
104
|
localized do
|
105
|
-
::Faker::Lorem.paragraphs(
|
105
|
+
::Faker::Lorem.paragraphs(...)
|
106
106
|
end
|
107
107
|
end
|
108
108
|
|
109
109
|
# Builds a question with Lorem Ipsum words. See Faker::Lorem for options.
|
110
110
|
#
|
111
111
|
# Returns a Hash with a value for each locale.
|
112
|
-
def self.question(
|
112
|
+
def self.question(...)
|
113
113
|
localized do
|
114
|
-
::Faker::Lorem.question(
|
114
|
+
::Faker::Lorem.question(...)
|
115
115
|
end
|
116
116
|
end
|
117
117
|
|
118
118
|
# Builds many questions with Lorem Ipsum words. See Faker::Lorem for options.
|
119
119
|
#
|
120
120
|
# Returns a Hash with a value for each locale.
|
121
|
-
def self.questions(
|
121
|
+
def self.questions(...)
|
122
122
|
localized do
|
123
|
-
::Faker::Lorem.questions(
|
123
|
+
::Faker::Lorem.questions(...)
|
124
124
|
end
|
125
125
|
end
|
126
126
|
|
@@ -150,8 +150,16 @@ module Decidim
|
|
150
150
|
# Returns a Hash with a value for each locale.
|
151
151
|
def self.wrapped(before, after)
|
152
152
|
result = yield
|
153
|
-
result.inject({}) do |wrapped, (locale,
|
154
|
-
|
153
|
+
result.inject({}) do |wrapped, (locale, value)|
|
154
|
+
if value.is_a?(Hash)
|
155
|
+
final_value = value.inject({}) do |new_wrapped, (new_locale, new_value)|
|
156
|
+
new_wrapped.update(new_locale => [before, new_value, after].join)
|
157
|
+
end
|
158
|
+
|
159
|
+
wrapped.update(locale => final_value)
|
160
|
+
else
|
161
|
+
wrapped.update(locale => [before, value, after].join)
|
162
|
+
end
|
155
163
|
end
|
156
164
|
end
|
157
165
|
|
@@ -160,13 +168,21 @@ module Decidim
|
|
160
168
|
#
|
161
169
|
# Returns a Hash with a value for each locale.
|
162
170
|
def self.localized
|
163
|
-
Decidim.available_locales
|
171
|
+
*locales, last_locale = Decidim.available_locales
|
172
|
+
|
173
|
+
value = locales.inject({}) do |result, locale|
|
164
174
|
text = ::Faker::Base.with_locale(locale) do
|
165
175
|
yield
|
166
176
|
end
|
167
177
|
|
168
178
|
result.update(locale => text)
|
169
179
|
end.with_indifferent_access
|
180
|
+
|
181
|
+
value.update(
|
182
|
+
"machine_translations" => {
|
183
|
+
last_locale => ::Faker::Base.with_locale(last_locale) { yield }
|
184
|
+
}.with_indifferent_access
|
185
|
+
)
|
170
186
|
end
|
171
187
|
|
172
188
|
# Prefixes the +msg+ for each available locale and returns as a Hash
|
@@ -174,9 +190,16 @@ module Decidim
|
|
174
190
|
#
|
175
191
|
# Return a Hash with a value for each locale.
|
176
192
|
def self.prefixed(msg, locales = Decidim.available_locales)
|
177
|
-
|
193
|
+
*all_locales, last_locale = locales
|
194
|
+
value = all_locales.inject({}) do |result, locale|
|
178
195
|
result.update(locale => "#{locale.to_s.upcase}: #{msg}")
|
179
196
|
end.with_indifferent_access
|
197
|
+
|
198
|
+
value.update(
|
199
|
+
"machine_translations" => {
|
200
|
+
last_locale => "#{last_locale.to_s.upcase}: #{msg}"
|
201
|
+
}.with_indifferent_access
|
202
|
+
)
|
180
203
|
end
|
181
204
|
end
|
182
205
|
end
|
@@ -36,7 +36,7 @@ module Decidim
|
|
36
36
|
)
|
37
37
|
end
|
38
38
|
|
39
|
-
if (extensions =
|
39
|
+
if (extensions = extension_allowlist)
|
40
40
|
messages << I18n.t(
|
41
41
|
"allowed_file_extensions",
|
42
42
|
extensions: extensions.join(" "),
|
@@ -47,6 +47,7 @@ module Decidim
|
|
47
47
|
messages
|
48
48
|
end
|
49
49
|
|
50
|
+
# rubocop: disable Metrics/CyclomaticComplexity
|
50
51
|
def max_file_size
|
51
52
|
# First try if the record itself has a file size validator defined.
|
52
53
|
validator = record.singleton_class.validators_on(attribute).find do |v|
|
@@ -70,13 +71,14 @@ module Decidim
|
|
70
71
|
|
71
72
|
lte.call(passthru_record) if lte.respond_to?(:call)
|
72
73
|
end
|
74
|
+
# rubocop: enable Metrics/CyclomaticComplexity
|
73
75
|
|
74
|
-
def
|
75
|
-
return unless uploader.respond_to?(:
|
76
|
+
def extension_allowlist
|
77
|
+
return unless uploader.respond_to?(:extension_allowlist, true)
|
76
78
|
|
77
79
|
# It may be a private method in some uploaders which is why we need to use
|
78
80
|
# `#send`.
|
79
|
-
uploader.send(:
|
81
|
+
uploader.send(:extension_allowlist)
|
80
82
|
end
|
81
83
|
|
82
84
|
private
|
data/lib/decidim/form_builder.rb
CHANGED
@@ -349,7 +349,7 @@ module Decidim
|
|
349
349
|
|
350
350
|
# Public: Override so checkboxes are rendered before the label.
|
351
351
|
def check_box(attribute, options = {}, checked_value = "1", unchecked_value = "0")
|
352
|
-
custom_label(attribute, options[:label], options[:label_options], true) do
|
352
|
+
custom_label(attribute, options[:label], options[:label_options], field_before_label: true) do
|
353
353
|
options.delete(:label)
|
354
354
|
options.delete(:label_options)
|
355
355
|
@template.check_box(@object_name, attribute, objectify_options(options), checked_value, unchecked_value)
|
@@ -361,7 +361,7 @@ module Decidim
|
|
361
361
|
def date_field(attribute, options = {})
|
362
362
|
value = object.send(attribute)
|
363
363
|
data = { datepicker: "" }
|
364
|
-
data[:startdate] = I18n.
|
364
|
+
data[:startdate] = I18n.l(value, format: :decidim_short) if value.present? && value.is_a?(Date)
|
365
365
|
datepicker_format = ruby_format_to_datepicker(I18n.t("date.formats.decidim_short"))
|
366
366
|
data[:"date-format"] = datepicker_format
|
367
367
|
|
@@ -379,7 +379,7 @@ module Decidim
|
|
379
379
|
def datetime_field(attribute, options = {})
|
380
380
|
value = object.send(attribute)
|
381
381
|
data = { datepicker: "", timepicker: "" }
|
382
|
-
data[:startdate] = I18n.
|
382
|
+
data[:startdate] = I18n.l(value, format: :decidim_short) if value.present? && value.is_a?(ActiveSupport::TimeWithZone)
|
383
383
|
datepicker_format = ruby_format_to_datepicker(I18n.t("time.formats.decidim_short"))
|
384
384
|
data[:"date-format"] = datepicker_format
|
385
385
|
|
@@ -388,7 +388,7 @@ module Decidim
|
|
388
388
|
options.merge(data: data)
|
389
389
|
)
|
390
390
|
help_text = I18n.t("decidim.datepicker.help_text", datepicker_format: datepicker_format)
|
391
|
-
template +=
|
391
|
+
template += content_tag(:span, help_text, class: "help-text")
|
392
392
|
template.html_safe
|
393
393
|
end
|
394
394
|
|
@@ -414,7 +414,7 @@ module Decidim
|
|
414
414
|
template += upload_help(attribute, options)
|
415
415
|
template += @template.file_field @object_name, attribute
|
416
416
|
|
417
|
-
template +=
|
417
|
+
template += extension_allowlist_help(options[:extension_allowlist]) if options[:extension_allowlist].present?
|
418
418
|
template += image_dimensions_help(options[:dimensions_info]) if options[:dimensions_info].present?
|
419
419
|
|
420
420
|
if file_is_image?(file)
|
@@ -429,14 +429,12 @@ module Decidim
|
|
429
429
|
template += @template.link_to file.file.filename, file.url, target: "_blank", rel: "noopener"
|
430
430
|
end
|
431
431
|
|
432
|
-
if file_is_present?(file)
|
433
|
-
|
434
|
-
|
435
|
-
|
436
|
-
|
437
|
-
|
438
|
-
])
|
439
|
-
end
|
432
|
+
if file_is_present?(file) && options[:optional]
|
433
|
+
template += content_tag :div, class: "field" do
|
434
|
+
safe_join([
|
435
|
+
@template.check_box(@object_name, "remove_#{attribute}"),
|
436
|
+
label("remove_#{attribute}", I18n.t("remove_this_file", scope: "decidim.forms"))
|
437
|
+
])
|
440
438
|
end
|
441
439
|
end
|
442
440
|
|
@@ -451,20 +449,28 @@ module Decidim
|
|
451
449
|
# rubocop:enable Metrics/CyclomaticComplexity
|
452
450
|
# rubocop:enable Metrics/PerceivedComplexity
|
453
451
|
|
454
|
-
def upload_help(attribute,
|
452
|
+
def upload_help(attribute, options = {})
|
455
453
|
humanizer = FileValidatorHumanizer.new(object, attribute)
|
456
454
|
|
457
455
|
help_scope = begin
|
458
|
-
if
|
456
|
+
if options[:help_i18n_scope].present?
|
457
|
+
options[:help_i18n_scope]
|
458
|
+
elsif humanizer.uploader.is_a?(Decidim::ImageUploader)
|
459
459
|
"decidim.forms.file_help.image"
|
460
460
|
else
|
461
461
|
"decidim.forms.file_help.file"
|
462
462
|
end
|
463
463
|
end
|
464
464
|
|
465
|
-
|
466
|
-
|
465
|
+
help_messages = begin
|
466
|
+
if options[:help_i18n_messages].present?
|
467
|
+
Array(options[:help_i18n_messages])
|
468
|
+
else
|
469
|
+
%w(message_1 message_2)
|
470
|
+
end
|
471
|
+
end
|
467
472
|
|
473
|
+
content_tag(:div, class: "help-text") do
|
468
474
|
inner = "<p>#{I18n.t("explanation", scope: help_scope)}</p>".html_safe
|
469
475
|
inner + content_tag(:ul) do
|
470
476
|
messages = help_messages.each.map { |msg| I18n.t(msg, scope: help_scope) }
|
@@ -556,6 +562,9 @@ module Decidim
|
|
556
562
|
html + error_and_help_text(attribute, options.merge(help_text: help_text))
|
557
563
|
end
|
558
564
|
|
565
|
+
# rubocop: disable Metrics/CyclomaticComplexity
|
566
|
+
# rubocop: disable Metrics/PerceivedComplexity
|
567
|
+
|
559
568
|
# Private: Builds a Hash of options to be injected at the HTML output as
|
560
569
|
# HTML5 validations.
|
561
570
|
#
|
@@ -574,6 +583,8 @@ module Decidim
|
|
574
583
|
validation_options[:maxlength] ||= max_length if max_length.to_i.positive?
|
575
584
|
validation_options
|
576
585
|
end
|
586
|
+
# rubocop: enable Metrics/CyclomaticComplexity
|
587
|
+
# rubocop: enable Metrics/PerceivedComplexity
|
577
588
|
|
578
589
|
# Private: Tries to find if an attribute is required in the form object.
|
579
590
|
#
|
@@ -644,7 +655,7 @@ module Decidim
|
|
644
655
|
# Returns a String.
|
645
656
|
# rubocop:disable Metrics/CyclomaticComplexity
|
646
657
|
# rubocop:disable Metrics/PerceivedComplexity
|
647
|
-
def custom_label(attribute, text, options, field_before_label
|
658
|
+
def custom_label(attribute, text, options, field_before_label: false, show_required: true)
|
648
659
|
return block_given? ? yield.html_safe : "".html_safe if text == false
|
649
660
|
|
650
661
|
text = default_label_text(object, attribute) if text.nil? || text == true
|
@@ -677,7 +688,7 @@ module Decidim
|
|
677
688
|
|
678
689
|
options = { count: 1, default: defaults }
|
679
690
|
|
680
|
-
text = I18n.t(defaults.shift, options)
|
691
|
+
text = I18n.t(defaults.shift, **options)
|
681
692
|
content_tag(:span, text, class: "form-error")
|
682
693
|
end
|
683
694
|
|
@@ -800,12 +811,12 @@ module Decidim
|
|
800
811
|
name.to_s.parameterize.underscore
|
801
812
|
end
|
802
813
|
|
803
|
-
def
|
814
|
+
def extension_allowlist_help(extension_allowlist)
|
804
815
|
content_tag :p, class: "extensions-help help-text" do
|
805
816
|
safe_join([
|
806
|
-
content_tag(:span, I18n.t("
|
817
|
+
content_tag(:span, I18n.t("extension_allowlist", scope: "decidim.forms.files")),
|
807
818
|
" ",
|
808
|
-
safe_join(
|
819
|
+
safe_join(extension_allowlist.map { |ext| content_tag(:b, ext) }, ", ")
|
809
820
|
])
|
810
821
|
end
|
811
822
|
end
|
@@ -25,11 +25,11 @@ module Decidim
|
|
25
25
|
end
|
26
26
|
|
27
27
|
def badge
|
28
|
-
@badge ||= Gamification.find_badge(extra
|
28
|
+
@badge ||= Gamification.find_badge(extra["badge_name"])
|
29
29
|
end
|
30
30
|
|
31
31
|
def current_level
|
32
|
-
extra
|
32
|
+
extra["current_level"]
|
33
33
|
end
|
34
34
|
|
35
35
|
def user
|
data/lib/decidim/geocodable.rb
CHANGED
@@ -29,11 +29,13 @@ module Decidim
|
|
29
29
|
|
30
30
|
private
|
31
31
|
|
32
|
+
# rubocop:disable Style/OptionalBooleanParameter
|
32
33
|
def do_lookup(_reverse = false)
|
33
34
|
RecordGeocoder.with_record(self) do
|
34
35
|
super
|
35
36
|
end
|
36
37
|
end
|
38
|
+
# rubocop:enable Style/OptionalBooleanParameter
|
37
39
|
end
|
38
40
|
|
39
41
|
module RecordGeocoder
|
data/lib/decidim/has_category.rb
CHANGED
@@ -24,7 +24,7 @@ module Decidim
|
|
24
24
|
def category_belongs_to_organization
|
25
25
|
return unless category
|
26
26
|
|
27
|
-
errors.add(:category, :invalid) unless component.categories.
|
27
|
+
errors.add(:category, :invalid) unless component.categories.exists?(id: category.id)
|
28
28
|
end
|
29
29
|
end
|
30
30
|
end
|
@@ -26,7 +26,7 @@ module Decidim
|
|
26
26
|
id: public_spaces +
|
27
27
|
private_spaces
|
28
28
|
.joins(:participatory_space_private_users)
|
29
|
-
.where(
|
29
|
+
.where(decidim_participatory_space_private_users: { decidim_user_id: user.id })
|
30
30
|
)
|
31
31
|
else
|
32
32
|
public_spaces
|
@@ -0,0 +1,36 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module Importers
|
5
|
+
# For importing data from files to components. Every resource type should
|
6
|
+
# specify it's own creator, which will be responsible for producing (creating)
|
7
|
+
# and finishing (saving) the imported resource.
|
8
|
+
class ImportManifest
|
9
|
+
attr_reader :name, :manifest
|
10
|
+
|
11
|
+
# Initializes the manifest.
|
12
|
+
#
|
13
|
+
# name - The name of the export artifact. It should be unique in the
|
14
|
+
# space or component.
|
15
|
+
#
|
16
|
+
# manifest - The parent manifest where this import manifest belongs to.
|
17
|
+
#
|
18
|
+
def initialize(name, manifest)
|
19
|
+
@name = name.to_sym
|
20
|
+
@manifest = manifest
|
21
|
+
end
|
22
|
+
|
23
|
+
# Public: Sets the creator when an argument is provided, returns the
|
24
|
+
# stored creator otherwise.
|
25
|
+
def creator(creator = nil)
|
26
|
+
@creator ||= creator || Decidim::Admin::Import::Creator
|
27
|
+
end
|
28
|
+
|
29
|
+
DEFAULT_FORMATS = %w(CSV JSON Excel).freeze
|
30
|
+
|
31
|
+
def formats
|
32
|
+
DEFAULT_FORMATS
|
33
|
+
end
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
@@ -57,8 +57,18 @@ module Decidim
|
|
57
57
|
@template.snippets.add(:head, @template.snippets.for(:geocoding))
|
58
58
|
end
|
59
59
|
|
60
|
+
options[:value] ||= object.send(attribute) if object.respond_to?(attribute)
|
61
|
+
if object.respond_to?(:latitude) && object.respond_to?(:longitude)
|
62
|
+
point = [object.latitude, object.longitude]
|
63
|
+
options["data-coordinates"] ||= point.join(",")
|
64
|
+
end
|
65
|
+
|
60
66
|
field(attribute, options) do |opts|
|
61
|
-
builder.geocoding_field(
|
67
|
+
builder.geocoding_field(
|
68
|
+
@object_name,
|
69
|
+
attribute,
|
70
|
+
opts
|
71
|
+
)
|
62
72
|
end
|
63
73
|
end
|
64
74
|
end
|
@@ -36,12 +36,11 @@ module Decidim
|
|
36
36
|
# With 'metric_operation' and 'metric_name':
|
37
37
|
# - Returns a single manifest related to that two params
|
38
38
|
def for(metric_operation, metric_name = nil)
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
list
|
39
|
+
if metric_name
|
40
|
+
all.find { |manifest| manifest.metric_operation == metric_operation.to_s && manifest.metric_name == metric_name.to_s }
|
41
|
+
else
|
42
|
+
all.find_all { |manifest| manifest.metric_operation == metric_operation.to_s }
|
43
|
+
end
|
45
44
|
end
|
46
45
|
|
47
46
|
def all
|
@@ -54,9 +54,7 @@ module Decidim
|
|
54
54
|
manifest = Decidim.find_participatory_space_manifest(participatory_space_name)
|
55
55
|
return self.class.none unless manifest
|
56
56
|
|
57
|
-
|
58
|
-
|
59
|
-
scope
|
57
|
+
manifest.participatory_spaces.call(organization)
|
60
58
|
end
|
61
59
|
|
62
60
|
# Links the given resources to this model, replaces any previous links with the same name.
|