decidim-core 0.21.0 → 0.22.0
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/app/assets/config/decidim_core_manifest.js +3 -0
- data/app/assets/fonts/decidim/Roboto-Regular.svg +1 -10520
- data/app/assets/fonts/decidim/Source_Sans_Pro_400.svg +1 -345
- data/app/assets/fonts/decidim/Source_Sans_Pro_600.svg +1 -339
- data/app/assets/fonts/decidim/Source_Sans_Pro_900.svg +1 -342
- data/app/assets/images/decidim/avatar-multiuser.png +0 -0
- data/app/assets/images/decidim/brands/google.svg +1 -1
- data/app/assets/images/decidim/decidim-logo.svg +1 -71
- data/app/assets/images/decidim/default-avatar.svg +1 -14
- data/app/assets/images/decidim/gamification/badges/followers.svg +1 -115
- data/app/assets/images/decidim/gamification/badges/invitations.svg +1 -117
- data/app/assets/images/decidim/icons.svg +1 -259
- data/app/assets/images/decidim/placeholder.jpg +0 -0
- data/app/assets/javascripts/decidim.js.es6 +23 -1
- data/app/assets/javascripts/decidim/ajax_modals.js.es6 +3 -0
- data/app/assets/javascripts/decidim/assets.js.erb +5 -0
- data/app/assets/javascripts/decidim/callout.js.es6 +18 -0
- data/app/assets/javascripts/decidim/configuration.js.es6 +23 -0
- data/app/assets/javascripts/decidim/confirm.js.es6 +178 -0
- data/app/assets/javascripts/decidim/conversations.js.es6 +17 -0
- 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/core/extrapoly.js +6 -0
- data/app/assets/javascripts/decidim/data_picker.js.es6 +128 -50
- data/app/assets/javascripts/decidim/diff_mode_dropdown.js.es6 +5 -7
- data/app/assets/javascripts/decidim/dropdowns_menus.js.es6 +32 -0
- data/app/assets/javascripts/decidim/external_link.js.es6 +69 -0
- data/app/assets/javascripts/decidim/floating_help.js.es6 +7 -0
- data/app/assets/javascripts/decidim/form_filter.component.js.es6 +1 -1
- data/app/assets/javascripts/decidim/form_filter.component.test.js +4 -4
- data/app/assets/javascripts/decidim/form_validator.es6 +61 -0
- data/app/assets/javascripts/decidim/foundation.js.es6 +28 -28
- data/app/assets/javascripts/decidim/icon.js.es6 +42 -0
- data/app/assets/javascripts/decidim/identity_selector_dialog.js.es6 +61 -0
- data/app/assets/javascripts/decidim/input_character_counter.js.es6 +115 -0
- data/app/assets/javascripts/decidim/input_mentions.js.es6 +34 -9
- data/app/assets/javascripts/decidim/input_multiple_mentions.js.es6 +195 -0
- data/app/assets/javascripts/decidim/map.js.es6 +40 -3
- data/app/assets/javascripts/decidim/orders.js.es6 +9 -28
- data/app/assets/javascripts/decidim/responsive_horizontal_tabs.js.es6 +12 -0
- data/app/assets/javascripts/decidim/results_listing.js.es6 +44 -0
- data/app/assets/javascripts/decidim/start_conversation_dialog.js +13 -0
- data/app/assets/javascripts/decidim/vizzs.js.es6 +1 -0
- data/app/assets/stylesheets/decidim/_decidim-settings.scss +5 -0
- data/app/assets/stylesheets/decidim/_decidim.scss +13 -11
- data/app/assets/stylesheets/decidim/_properties.scss +25 -0
- data/app/assets/stylesheets/decidim/_variables.scss +6 -24
- data/app/assets/stylesheets/decidim/application.scss.erb +2 -2
- data/app/assets/stylesheets/decidim/editor.scss +2 -2
- data/app/assets/stylesheets/decidim/email.scss +1771 -0
- data/app/assets/stylesheets/decidim/extras/_external-links.scss +29 -0
- data/app/assets/stylesheets/decidim/extras/_extras.scss +17 -0
- data/app/assets/stylesheets/decidim/extras/_label-required.scss +9 -0
- data/app/assets/stylesheets/decidim/extras/_process_stats.scss +1 -1
- data/app/assets/stylesheets/decidim/extras/_quill.scss +5 -0
- data/app/assets/stylesheets/decidim/extras/_results-per-page.scss +8 -0
- data/app/assets/stylesheets/decidim/layouts/_home.scss +31 -7
- data/app/assets/stylesheets/decidim/layouts/_layouts.scss +5 -0
- data/app/assets/stylesheets/decidim/layouts/_logo.scss +26 -0
- data/app/assets/stylesheets/decidim/layouts/_user.scss +4 -0
- data/app/assets/stylesheets/decidim/modules/_author-avatar.scss +9 -13
- data/app/assets/stylesheets/decidim/modules/_buttons.scss +198 -26
- data/app/assets/stylesheets/decidim/modules/_cards.scss +174 -23
- data/app/assets/stylesheets/decidim/modules/_collapsible-list.scss +21 -0
- data/app/assets/stylesheets/decidim/modules/_comments.scss +25 -1
- data/app/assets/stylesheets/decidim/modules/_conference-programme.scss +0 -1
- data/app/assets/stylesheets/decidim/modules/_confirm.scss +5 -0
- data/app/assets/stylesheets/decidim/modules/_conversation.scss +50 -0
- data/app/assets/stylesheets/decidim/modules/_data-picker.scss +9 -11
- data/app/assets/stylesheets/decidim/modules/_definition-data.scss +6 -1
- data/app/assets/stylesheets/decidim/modules/_docs-manager.scss +0 -1
- data/app/assets/stylesheets/decidim/modules/_extra.scss +0 -2
- data/app/assets/stylesheets/decidim/modules/_filters.scss +25 -1
- data/app/assets/stylesheets/decidim/modules/_floating-helper.scss +20 -8
- data/app/assets/stylesheets/decidim/modules/_footer.scss +8 -4
- data/app/assets/stylesheets/decidim/modules/_forms.scss +63 -4
- data/app/assets/stylesheets/decidim/modules/_horizontal-tabs.scss +64 -1
- data/app/assets/stylesheets/decidim/modules/_inline-filters.scss +6 -3
- data/app/assets/stylesheets/decidim/modules/_input-gallery.scss +10 -0
- data/app/assets/stylesheets/decidim/modules/_input-mentions.scss +25 -7
- data/app/assets/stylesheets/decidim/modules/_input-multiple-mentions.scss +5 -0
- data/app/assets/stylesheets/decidim/modules/_map.scss +11 -0
- data/app/assets/stylesheets/decidim/modules/_margins.scss +8 -7
- data/app/assets/stylesheets/decidim/modules/_messages.scss +18 -18
- data/app/assets/stylesheets/decidim/modules/_modules.scss +75 -72
- data/app/assets/stylesheets/decidim/modules/_navbar.scss +176 -26
- data/app/assets/stylesheets/decidim/modules/_notification.scss +5 -0
- data/app/assets/stylesheets/decidim/modules/_order-by.scss +5 -0
- data/app/assets/stylesheets/decidim/modules/_process-nav.scss +5 -2
- data/app/assets/stylesheets/decidim/modules/_process-phase.scss +2 -4
- data/app/assets/stylesheets/decidim/modules/_process-stats.scss +2 -2
- data/app/assets/stylesheets/decidim/modules/_progress-bar.scss +1 -1
- data/app/assets/stylesheets/decidim/modules/_reveal.scss +6 -0
- data/app/assets/stylesheets/decidim/modules/_signup.scss +6 -5
- data/app/assets/stylesheets/decidim/modules/_static-pages.scss +0 -1
- data/app/assets/stylesheets/decidim/modules/_sticky.scss +5 -0
- data/app/assets/stylesheets/decidim/modules/_tags.scss +4 -0
- data/app/assets/stylesheets/decidim/modules/_timeline.scss +1 -2
- data/app/assets/stylesheets/decidim/modules/_typography.scss +47 -8
- data/app/assets/stylesheets/decidim/modules/_versions.scss +0 -1
- data/app/assets/stylesheets/decidim/utils/_helpers.scss +8 -0
- data/app/assets/stylesheets/decidim/utils/_mixins.scss +86 -7
- data/app/assets/stylesheets/decidim/utils/_settings.scss +81 -69
- data/app/assets/stylesheets/decidim/vizzs.scss +8 -0
- data/app/assets/stylesheets/decidim/vizzs/_areachart.scss +0 -1
- data/app/assets/stylesheets/decidim/vizzs/_linechart.scss +0 -1
- data/app/assets/stylesheets/decidim/vizzs/_rowchart.scss +0 -1
- data/app/assets/stylesheets/decidim/vizzs/_vizzs.scss +5 -0
- data/app/assets/stylesheets/foundation-overrides/components/_button-group.scss +319 -0
- data/app/cells/decidim/activity/show.erb +24 -21
- data/app/cells/decidim/activity_cell.rb +2 -0
- data/app/cells/decidim/address_cell.rb +1 -1
- data/app/cells/decidim/amendable/amend_button_card_cell.rb +1 -5
- data/app/cells/decidim/amendable/promote_button_card_cell.rb +1 -1
- data/app/cells/decidim/announcement/show.erb +1 -1
- data/app/cells/decidim/author/comments.erb +1 -1
- data/app/cells/decidim/author/endorsements.erb +6 -0
- data/app/cells/decidim/author/flag.erb +5 -2
- data/app/cells/decidim/author/profile_inline.erb +0 -1
- data/app/cells/decidim/author/show.erb +2 -0
- data/app/cells/decidim/author/withdraw.erb +2 -2
- data/app/cells/decidim/author_cell.rb +9 -13
- data/app/cells/decidim/badge/show.erb +6 -6
- data/app/cells/decidim/badge/small.erb +2 -1
- data/app/cells/decidim/card/show.erb +4 -4
- data/app/cells/decidim/card_m/comments_counter.erb +1 -1
- data/app/cells/decidim/card_m/header.erb +4 -4
- data/app/cells/decidim/card_m/image.erb +1 -1
- data/app/cells/decidim/card_m/show.erb +2 -2
- data/app/cells/decidim/card_m_cell.rb +3 -2
- data/app/cells/decidim/collapsible_list/show.erb +3 -3
- data/app/cells/decidim/content_blocks/footer_sub_hero/show.erb +4 -4
- data/app/cells/decidim/content_blocks/hero_settings_form/show.erb +2 -2
- data/app/cells/decidim/content_blocks/how_to_participate/show.erb +8 -8
- data/app/cells/decidim/content_blocks/last_activity_cell.rb +1 -1
- data/app/cells/decidim/content_blocks/stats/show.erb +1 -1
- data/app/cells/decidim/content_blocks/sub_hero/show.erb +3 -3
- data/app/cells/decidim/diff/attribute.erb +10 -10
- data/app/cells/decidim/diff_cell.rb +11 -1
- data/app/cells/decidim/endorsement_buttons/select_identity_button.erb +10 -0
- data/app/cells/decidim/endorsement_buttons/show.erb +4 -0
- data/app/cells/decidim/endorsement_buttons_cell.rb +208 -0
- data/app/cells/decidim/endorsers_list/show.erb +16 -0
- data/app/cells/decidim/endorsers_list_cell.rb +29 -0
- data/app/cells/decidim/fingerprint_cell.rb +1 -0
- data/app/cells/decidim/follow_button/show.erb +13 -5
- data/app/cells/decidim/follow_button_cell.rb +29 -5
- data/app/cells/decidim/navbar_admin_link/show.erb +1 -1
- data/app/cells/decidim/navbar_admin_link_cell.rb +6 -0
- data/app/cells/decidim/newsletter_templates/base_cell.rb +30 -0
- data/app/cells/decidim/newsletter_templates/base_settings_form_cell.rb +13 -0
- data/app/cells/decidim/newsletter_templates/basic_only_text/show.erb +86 -0
- data/app/cells/decidim/newsletter_templates/basic_only_text_cell.rb +21 -0
- data/app/cells/decidim/newsletter_templates/basic_only_text_settings_form/show.erb +7 -0
- data/app/cells/decidim/newsletter_templates/basic_only_text_settings_form_cell.rb +8 -0
- data/app/cells/decidim/newsletter_templates/image_text_cta/show.erb +125 -0
- data/app/cells/decidim/newsletter_templates/image_text_cta_cell.rb +61 -0
- data/app/cells/decidim/newsletter_templates/image_text_cta_settings_form/show.erb +17 -0
- data/app/cells/decidim/newsletter_templates/image_text_cta_settings_form_cell.rb +8 -0
- data/app/cells/decidim/notifications/show.erb +1 -1
- data/app/cells/decidim/profile/show.erb +2 -2
- data/app/cells/decidim/profile/user_group_tabs.erb +10 -5
- data/app/cells/decidim/profile/user_tabs.erb +16 -14
- data/app/cells/decidim/profile_cell.rb +18 -0
- data/app/cells/decidim/profile_sidebar/show.erb +16 -16
- data/app/cells/decidim/profile_sidebar_cell.rb +1 -0
- data/app/cells/decidim/search_results_section/show.erb +1 -1
- data/app/cells/decidim/tags_cell.rb +32 -2
- data/app/cells/decidim/user_activity/show.erb +19 -1
- data/app/cells/decidim/user_activity_cell.rb +6 -0
- data/app/cells/decidim/user_conversation/conversation_header.erb +14 -0
- data/app/cells/decidim/user_conversation/messages.erb +15 -0
- data/app/cells/decidim/user_conversation/new.erb +15 -0
- data/app/cells/decidim/user_conversation/reply.erb +17 -0
- data/app/cells/decidim/user_conversation/show.erb +20 -0
- data/app/cells/decidim/user_conversation_cell.rb +75 -0
- data/app/cells/decidim/user_conversations/add_conversation_users.erb +25 -0
- data/app/cells/decidim/user_conversations/conversation_item.erb +38 -0
- data/app/cells/decidim/user_conversations/show.erb +58 -0
- data/app/cells/decidim/user_conversations_cell.rb +40 -0
- data/app/cells/decidim/user_group_admin_membership_profile/footer.erb +3 -3
- data/app/cells/decidim/user_profile/footer.erb +1 -1
- data/app/cells/decidim/user_profile/unlinked_user_data.erb +16 -0
- data/app/cells/decidim/user_profile/user_data.erb +1 -1
- data/app/cells/decidim/user_profile_cell.rb +7 -1
- data/app/cells/decidim/user_timeline_cell.rb +4 -0
- data/app/cells/decidim/version/show.erb +31 -0
- data/app/{views/decidim/shared/_version_author.html.erb → cells/decidim/version_author/show.erb} +1 -1
- data/app/cells/decidim/version_author_cell.rb +9 -0
- data/app/cells/decidim/version_cell.rb +83 -0
- data/app/cells/decidim/versions_list/show.erb +32 -0
- data/app/cells/decidim/versions_list_cell.rb +64 -0
- data/app/cells/decidim/versions_list_item/show.erb +20 -0
- data/app/cells/decidim/versions_list_item_cell.rb +51 -0
- data/app/cells/decidim/wizard_step_form/wizard_aside.erb +1 -1
- data/app/cells/decidim/wizard_step_form/wizard_header.erb +2 -2
- data/app/cells/decidim/wizard_step_form_cell.rb +4 -1
- data/app/commands/decidim/attachment_methods.rb +40 -0
- data/app/commands/decidim/create_registration.rb +2 -1
- data/app/commands/decidim/create_user_group.rb +12 -0
- data/app/commands/decidim/destroy_account.rb +12 -0
- data/app/commands/decidim/endorse_resource.rb +64 -0
- data/app/commands/decidim/gallery_methods.rb +64 -0
- data/app/commands/decidim/invite_user_again.rb +2 -4
- data/app/commands/decidim/messaging/reply_to_conversation.rb +34 -3
- data/app/commands/decidim/messaging/start_conversation.rb +36 -5
- data/app/commands/decidim/unendorse_resource.rb +38 -0
- data/app/commands/decidim/update_notifications_settings.rb +1 -0
- data/app/commands/decidim/update_user_group.rb +14 -1
- data/app/controllers/concerns/decidim/impersonate_users.rb +13 -0
- data/app/controllers/concerns/decidim/resource_versions_concern.rb +28 -0
- data/app/controllers/decidim/devise/registrations_controller.rb +2 -4
- data/app/controllers/decidim/devise/sessions_controller.rb +5 -0
- data/app/controllers/decidim/endorsements_controller.rb +71 -0
- data/app/controllers/decidim/messaging/conversations_controller.rb +52 -12
- data/app/controllers/decidim/newsletters_controller.rb +2 -2
- data/app/controllers/decidim/profiles_controller.rb +6 -0
- data/app/controllers/decidim/scopes_controller.rb +1 -0
- data/app/controllers/decidim/user_activities_controller.rb +19 -2
- data/app/controllers/decidim/user_conversations_controller.rb +142 -0
- data/app/controllers/decidim/user_timeline_controller.rb +19 -2
- data/app/events/decidim/resource_endorsed_event.rb +35 -0
- data/app/events/decidim/user_group_admin_event.rb +37 -0
- data/app/events/decidim/user_group_created_event.rb +6 -0
- data/app/events/decidim/user_group_updated_event.rb +6 -0
- data/app/forms/decidim/attachment_form.rb +1 -0
- data/app/forms/decidim/messaging/conversation_form.rb +10 -4
- data/app/forms/decidim/notifications_settings_form.rb +6 -0
- data/app/forms/decidim/registration_form.rb +1 -0
- data/app/functions/decidim/core/component_finder_base.rb +10 -3
- data/app/functions/decidim/core/component_list_base.rb +8 -2
- data/app/functions/decidim/core/user_entity_finder.rb +33 -0
- data/app/functions/decidim/core/user_entity_list.rb +31 -0
- data/app/helpers/concerns/decidim/flash_helper_extensions.rb +47 -0
- data/app/helpers/decidim/action_authorization_helper.rb +24 -2
- data/app/helpers/decidim/amendments_helper.rb +5 -3
- data/app/helpers/decidim/application_helper.rb +7 -1
- data/app/helpers/decidim/check_boxes_tree_helper.rb +4 -5
- data/app/helpers/decidim/cta_button_helper.rb +1 -1
- data/app/helpers/decidim/decidim_form_helper.rb +23 -0
- data/app/helpers/decidim/endorsable_helper.rb +93 -0
- data/app/helpers/decidim/filters_helper.rb +15 -5
- data/app/helpers/decidim/followable_helper.rb +11 -0
- data/app/helpers/decidim/layout_helper.rb +23 -5
- data/app/helpers/decidim/map_helper.rb +15 -2
- data/app/helpers/decidim/markup_helper.rb +9 -0
- data/app/helpers/decidim/messaging/conversation_helper.rb +61 -7
- data/app/helpers/decidim/orders_helper.rb +10 -1
- data/app/helpers/decidim/participatory_space_helpers.rb +1 -1
- data/app/helpers/decidim/resource_versions_helper.rb +24 -7
- data/app/helpers/decidim/rich_text_editor_helper.rb +1 -0
- data/app/helpers/decidim/sanitize_helper.rb +10 -2
- data/app/helpers/decidim/tooltip_helper.rb +1 -1
- data/app/helpers/decidim/traceability_helper.rb +2 -8
- data/app/helpers/decidim/user_profile_helper.rb +1 -1
- data/app/helpers/decidim/widget_urls_helper.rb +4 -2
- data/app/jobs/decidim/event_publisher_job.rb +1 -1
- data/app/mailers/concerns/decidim/multitenant_asset_host.rb +33 -0
- data/app/mailers/decidim/application_mailer.rb +1 -0
- data/app/mailers/decidim/messaging/conversation_mailer.rb +53 -4
- data/app/mailers/decidim/newsletter_mailer.rb +22 -4
- data/app/middleware/decidim/strip_x_forwarded_host.rb +14 -0
- data/app/models/decidim/action_log.rb +1 -1
- data/app/models/decidim/amendment.rb +0 -18
- data/app/models/decidim/authorization.rb +24 -0
- data/app/models/decidim/component.rb +7 -0
- data/app/models/decidim/content_block.rb +5 -3
- data/app/models/decidim/endorsement.rb +30 -0
- data/app/models/decidim/messaging/conversation.rb +39 -11
- data/app/models/decidim/messaging/message.rb +31 -5
- data/app/models/decidim/messaging/participation.rb +1 -1
- data/app/models/decidim/messaging/receipt.rb +8 -0
- data/app/models/decidim/newsletter.rb +7 -1
- data/app/models/decidim/organization.rb +16 -7
- data/app/models/decidim/user.rb +32 -0
- data/app/models/decidim/user_group.rb +23 -0
- data/app/permissions/decidim/permissions.rb +19 -6
- data/app/presenters/decidim/admin_log/user_presenter.rb +1 -1
- data/app/presenters/decidim/metric_charts_presenter.rb +33 -13
- data/app/presenters/decidim/nil_presenter.rb +29 -0
- data/app/presenters/decidim/resource_locator_presenter.rb +2 -1
- data/app/presenters/decidim/user_group_presenter.rb +1 -1
- data/app/presenters/decidim/user_presenter.rb +6 -0
- data/app/queries/decidim/metric_manage.rb +5 -0
- data/app/queries/decidim/metrics/followers_metric_manage.rb +1 -6
- data/app/queries/decidim/user_groups/admin_memberships.rb +3 -3
- data/app/services/decidim/activity_search.rb +1 -0
- data/app/services/decidim/base_diff_renderer.rb +25 -3
- data/app/services/decidim/events_manager.rb +4 -1
- data/app/types/decidim/core/decidim_type.rb +0 -4
- data/app/types/decidim/core/has_endorsable_input_sort.rb +17 -0
- data/app/types/decidim/core/has_timestamp_input_filter.rb +52 -0
- data/app/types/decidim/core/has_timestamp_input_sort.rb +12 -0
- data/app/types/decidim/core/user_entity_input_filter.rb +81 -0
- data/app/types/decidim/core/user_entity_input_sort.rb +24 -0
- data/app/types/decidim/core/user_group_type.rb +17 -5
- data/app/types/decidim/core/user_type.rb +17 -6
- data/app/uploaders/decidim/attachment_uploader.rb +1 -1
- data/app/uploaders/decidim/avatar_uploader.rb +4 -0
- data/app/uploaders/decidim/image_uploader.rb +28 -4
- data/app/uploaders/decidim/newsletter_template_image_uploader.rb +36 -0
- data/app/views/decidim/account/delete.html.erb +6 -3
- data/app/views/decidim/account/show.html.erb +17 -10
- data/app/views/decidim/amendments/_edit_form_fields.html.erb +2 -0
- data/app/views/decidim/amendments/_similar_emendation.html.erb +4 -4
- data/app/views/decidim/amendments/compare_draft.html.erb +2 -2
- data/app/views/decidim/amendments/edit_draft.html.erb +2 -2
- data/app/views/decidim/amendments/new.html.erb +2 -2
- data/app/views/decidim/amendments/preview_draft.html.erb +2 -2
- data/app/views/decidim/amendments/review.html.erb +3 -3
- data/app/views/decidim/application/_collection.html.erb +2 -2
- data/app/views/decidim/application/_document.html.erb +4 -4
- data/app/views/decidim/application/_documents.html.erb +1 -1
- data/app/views/decidim/application/_photos.html.erb +1 -1
- data/app/views/decidim/authorization_modals/show.html.erb +1 -1
- data/app/views/decidim/data_portability/show.html.erb +3 -0
- data/app/views/decidim/devise/confirmations/new.html.erb +3 -3
- data/app/views/decidim/devise/invitations/edit.html.erb +13 -13
- data/app/views/decidim/devise/omniauth_registrations/new.html.erb +5 -3
- data/app/views/decidim/devise/passwords/edit.html.erb +5 -3
- data/app/views/decidim/devise/passwords/new.html.erb +3 -3
- data/app/views/decidim/devise/registrations/edit.html.erb +2 -1
- data/app/views/decidim/devise/registrations/new.html.erb +7 -8
- data/app/views/decidim/devise/sessions/new.html.erb +4 -6
- data/app/views/decidim/devise/shared/_newsletter_modal.html.erb +3 -3
- data/app/views/decidim/devise/shared/_omniauth_buttons.html.erb +3 -1
- data/app/views/decidim/devise/shared/_omniauth_buttons_mini.html.erb +4 -1
- data/app/views/decidim/devise/unlocks/new.html.erb +3 -3
- data/app/views/decidim/doorkeeper/authorizations/new.html.erb +2 -2
- data/app/views/decidim/endorsements/_identity.html.erb +9 -0
- data/app/views/decidim/endorsements/identities.html.erb +12 -0
- data/app/views/decidim/endorsements/update_buttons_and_counters.js.erb +20 -0
- data/app/views/decidim/errors/internal_server_error.html.erb +2 -2
- data/app/views/decidim/errors/not_found.html.erb +2 -2
- data/app/views/decidim/gamification/badges/index.html.erb +4 -4
- data/app/views/decidim/group_admins/index.html.erb +6 -4
- data/app/views/decidim/group_invites/index.html.erb +5 -2
- data/app/views/decidim/group_members/index.html.erb +6 -4
- data/app/views/decidim/groups/_form.html.erb +2 -0
- data/app/views/decidim/groups/edit.html.erb +4 -2
- data/app/views/decidim/groups/new.html.erb +2 -2
- data/app/views/decidim/last_activities/index.html.erb +2 -0
- data/app/views/decidim/messaging/conversation_mailer/comanagers_new_conversation.html.erb +17 -0
- data/app/views/decidim/messaging/conversation_mailer/comanagers_new_message.html.erb +17 -0
- data/app/views/decidim/messaging/conversation_mailer/new_conversation.html.erb +2 -2
- data/app/views/decidim/messaging/conversation_mailer/new_group_conversation.html.erb +17 -0
- data/app/views/decidim/messaging/conversation_mailer/new_group_message.html.erb +17 -0
- data/app/views/decidim/messaging/conversation_mailer/new_message.html.erb +2 -2
- data/app/views/decidim/messaging/conversations/_add_conversation_users.html.erb +24 -0
- data/app/views/decidim/messaging/conversations/_conversation.html.erb +54 -0
- data/app/views/decidim/messaging/conversations/_messages.html.erb +15 -0
- data/app/views/decidim/messaging/conversations/_new_conversation_button.html.erb +33 -0
- data/app/views/decidim/messaging/conversations/_reply.html.erb +3 -3
- data/app/views/decidim/messaging/conversations/_show.html.erb +34 -15
- data/app/views/decidim/messaging/conversations/_start.html.erb +7 -1
- data/app/views/decidim/messaging/conversations/create.js.erb +1 -1
- data/app/views/decidim/messaging/conversations/index.html.erb +34 -29
- data/app/views/decidim/messaging/conversations/new.html.erb +1 -1
- data/app/views/decidim/messaging/conversations/show.html.erb +8 -4
- data/app/views/decidim/messaging/conversations/update.js.erb +1 -1
- data/app/views/decidim/newsletter_mailer/newsletter.html.erb +2 -2
- data/app/views/decidim/newsletters/show.html.erb +8 -1
- data/app/views/decidim/notifications/index.html.erb +4 -2
- data/app/views/decidim/notifications_settings/show.html.erb +14 -1
- data/app/views/decidim/own_user_groups/index.html.erb +4 -0
- data/app/views/decidim/pages/_standalone.html.erb +1 -1
- data/app/views/decidim/pages/_tabbed.html.erb +5 -5
- data/app/views/decidim/pages/index.html.erb +22 -13
- data/app/views/decidim/profiles/_user_follow.erb +3 -3
- data/app/views/decidim/profiles/show.html.erb +2 -0
- data/app/views/decidim/scopes/_scopes_picker_input.html.erb +11 -4
- data/app/views/decidim/scopes/picker.html.erb +26 -16
- data/app/views/decidim/searches/_count.html.erb +14 -11
- data/app/views/decidim/searches/_filters.html.erb +2 -2
- data/app/views/decidim/searches/index.html.erb +5 -3
- data/app/views/decidim/shared/_check_boxes_tree.html.erb +5 -3
- data/app/views/decidim/shared/_confirm_modal.html.erb +18 -0
- data/app/views/decidim/shared/_embed_modal.html.erb +4 -1
- data/app/views/decidim/shared/_extended_navigation_bar.html.erb +2 -2
- data/app/views/decidim/shared/_filter_form_help.erb +8 -0
- data/app/views/decidim/shared/_floating_help.html.erb +7 -7
- data/app/views/decidim/shared/_login_modal.html.erb +4 -4
- data/app/views/decidim/shared/_orders.html.erb +16 -5
- data/app/views/decidim/shared/_results_per_page.html.erb +16 -6
- data/app/views/decidim/shared/_share_modal.html.erb +8 -4
- data/app/views/decidim/shared/_static_map.html.erb +1 -1
- data/app/views/decidim/shared/participatory_space_filters/_filters.html.erb +1 -1
- data/app/views/decidim/user_activities/index.html.erb +4 -0
- data/app/views/decidim/user_activities/index.js.erb +14 -0
- data/app/views/decidim/user_conversations/index.html.erb +4 -0
- data/app/views/decidim/user_conversations/show.html.erb +4 -0
- data/app/views/decidim/user_conversations/update.js.erb +8 -0
- data/app/views/decidim/user_interests/_scopes.html.erb +12 -10
- data/app/views/decidim/user_interests/show.html.erb +4 -1
- data/app/views/decidim/user_timeline/index.html.erb +5 -1
- data/app/views/decidim/user_timeline/index.js.erb +14 -0
- data/app/views/kaminari/decidim/_first_page.html.erb +5 -1
- data/app/views/kaminari/decidim/_last_page.html.erb +5 -1
- data/app/views/kaminari/decidim/_next_page.html.erb +6 -1
- data/app/views/kaminari/decidim/_page.html.erb +2 -2
- data/app/views/kaminari/decidim/_paginator.html.erb +16 -14
- data/app/views/kaminari/decidim/_prev_page.html.erb +6 -1
- data/app/views/layouts/decidim/_application.html.erb +4 -2
- data/app/views/layouts/decidim/_cookie_warning.html.erb +1 -1
- data/app/views/layouts/decidim/_edit_link.html.erb +0 -0
- data/app/views/layouts/decidim/_head.html.erb +2 -0
- data/app/views/layouts/decidim/_js_configuration.html.erb +28 -0
- data/app/views/layouts/decidim/_language_chooser.html.erb +10 -5
- data/app/views/layouts/decidim/_logo.html.erb +2 -22
- data/app/views/layouts/decidim/_mailer_logo.html.erb +2 -22
- data/app/views/layouts/decidim/_main_footer.html.erb +3 -1
- data/app/views/layouts/decidim/_mini_footer.html.erb +7 -7
- data/app/views/layouts/decidim/_omnipresent_banner.html.erb +1 -1
- data/app/views/layouts/decidim/_organization_colors.html.erb +4 -3
- data/app/views/layouts/decidim/_social_media_links.html.erb +15 -10
- data/app/views/layouts/decidim/_topbar_search.html.erb +12 -2
- data/app/views/layouts/decidim/_user_menu.html.erb +6 -6
- data/app/views/layouts/decidim/_wrapper.html.erb +21 -16
- data/app/views/layouts/decidim/newsletter_base.html.erb +46 -0
- data/app/views/layouts/decidim/user_profile.html.erb +8 -3
- data/app/views/layouts/decidim/widget.html.erb +1 -0
- data/config/initializers/devise.rb +11 -3
- data/config/initializers/invisible_captcha.rb +1 -0
- data/config/initializers/omniauth.rb +7 -1
- data/config/initializers/rack_attack.rb +25 -16
- data/config/locales/ar.yml +7 -5
- data/config/locales/bg-BG.yml +1512 -0
- data/config/locales/ca.yml +258 -6
- data/config/locales/cs.yml +297 -37
- data/config/locales/da-DK.yml +9 -0
- data/config/locales/de.yml +279 -5
- data/config/locales/el.yml +1443 -5
- data/config/locales/en.yml +263 -11
- data/config/locales/es-MX.yml +257 -5
- data/config/locales/es-PY.yml +257 -5
- data/config/locales/es.yml +257 -5
- data/config/locales/et-EE.yml +9 -0
- data/config/locales/eu.yml +7 -2
- data/config/locales/fi-plain.yml +258 -6
- data/config/locales/fi.yml +319 -67
- data/config/locales/fr-CA.yml +1585 -0
- data/config/locales/fr.yml +263 -5
- data/config/locales/ga-IE.yml +9 -0
- data/config/locales/gl.yml +7 -2
- data/config/locales/hr-HR.yml +9 -0
- data/config/locales/hu.yml +87 -5
- data/config/locales/id-ID.yml +7 -2
- data/config/locales/is-IS.yml +1 -0
- data/config/locales/it.yml +279 -27
- data/config/locales/ja-JP.yml +1578 -0
- data/config/locales/lt-LT.yml +9 -0
- data/config/locales/lv-LV.yml +1485 -0
- data/config/locales/mt-MT.yml +9 -0
- data/config/locales/nl.yml +261 -6
- data/config/locales/no.yml +117 -41
- data/config/locales/pl.yml +755 -406
- data/config/locales/pt-BR.yml +8 -4
- data/config/locales/pt.yml +875 -536
- data/config/locales/ro-RO.yml +1603 -0
- data/config/locales/ru.yml +6 -1
- data/config/locales/sk-SK.yml +1426 -0
- data/config/locales/sk.yml +1441 -0
- data/config/locales/sl.yml +71 -0
- data/config/locales/sr-CS.yml +129 -0
- data/config/locales/sv.yml +323 -24
- data/config/locales/tr-TR.yml +7 -2
- data/config/locales/uk.yml +6 -1
- data/config/routes.rb +5 -0
- data/db/migrate/20180810092428_move_organization_fields_to_hero_content_block.rb +2 -2
- data/db/migrate/20191130151925_create_decidim_endorsements.rb +13 -0
- data/db/migrate/20191204075509_add_session_token_to_users.rb +7 -0
- data/db/migrate/20200211173227_add_direct_message_types_to_users.rb +12 -0
- data/db/migrate/20200320105904_index_foreign_keys_in_decidim_action_logs.rb +9 -0
- data/db/migrate/20200320105905_index_foreign_keys_in_decidim_amendments.rb +7 -0
- data/db/migrate/20200320105909_index_foreign_keys_in_decidim_authorizations.rb +7 -0
- data/db/migrate/20200320105917_index_foreign_keys_in_decidim_contextual_help_sections.rb +7 -0
- data/db/migrate/20200320105919_index_foreign_keys_in_decidim_endorsements.rb +7 -0
- data/db/migrate/20200320105923_index_foreign_keys_in_decidim_notifications.rb +7 -0
- data/db/migrate/20200320105927_index_foreign_keys_in_oauth_access_grants.rb +7 -0
- data/db/migrate/20200323094443_add_id_to_content_blocks_scope.rb +7 -0
- data/db/migrate/20200326102407_rename_scope_column.rb +7 -0
- data/db/migrate/20200327082257_migrate_newsletters_to_templates.rb +33 -0
- data/db/migrate/20200327082954_remove_newsletter_body.rb +7 -0
- data/db/migrate/20200401073419_add_index_on_content_block_scope_id.rb +11 -0
- data/db/seeds.rb +1 -1
- data/{app/controllers/concerns → lib}/decidim/action_authorization.rb +0 -0
- data/lib/decidim/api/author_interface.rb +4 -0
- data/lib/decidim/api/endorsable_interface.rb +22 -0
- data/lib/decidim/api/participatory_space_interface.rb +2 -0
- data/lib/decidim/api/timestamps_interface.rb +2 -2
- data/lib/decidim/coauthorable.rb +1 -1
- data/lib/decidim/component_manifest.rb +14 -0
- data/lib/decidim/content_parsers.rb +1 -0
- data/lib/decidim/content_parsers/user_group_parser.rb +61 -0
- data/lib/decidim/content_parsers/user_parser.rb +3 -5
- data/lib/decidim/content_renderers.rb +1 -0
- data/lib/decidim/content_renderers/user_group_renderer.rb +30 -0
- data/lib/decidim/core.rb +65 -21
- data/lib/decidim/core/api.rb +1 -0
- data/lib/decidim/core/engine.rb +88 -6
- data/lib/decidim/core/test.rb +8 -0
- data/lib/decidim/core/test/factories.rb +103 -3
- data/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb +79 -0
- data/lib/decidim/core/test/shared_examples/back_to_list_button_examples.rb +17 -0
- data/lib/decidim/core/test/shared_examples/comments_examples.rb +17 -2
- data/lib/decidim/core/test/shared_examples/edit_link_shared_examples.rb +5 -1
- data/lib/decidim/core/test/shared_examples/endorsable_interface_examples.rb +22 -0
- data/lib/decidim/core/test/shared_examples/endorsements_controller_shared_context.rb +22 -0
- data/lib/decidim/core/test/shared_examples/follows_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/input_sort_examples.rb +21 -0
- data/lib/decidim/core/test/shared_examples/logo_email.rb +20 -0
- data/lib/decidim/core/test/shared_examples/metric_manage_shared_context.rb +9 -0
- data/lib/decidim/core/test/shared_examples/permissions.rb +143 -0
- data/lib/decidim/core/test/shared_examples/reports_examples.rb +4 -4
- data/lib/decidim/core/test/shared_examples/rich_text_editor_examples.rb +3 -3
- data/lib/decidim/core/test/shared_examples/simple_event.rb +1 -0
- data/lib/decidim/core/test/shared_examples/system_endorse_resource_examples.rb +165 -0
- data/lib/decidim/core/test/shared_examples/traceable_interface_examples.rb +3 -3
- data/lib/decidim/core/test/shared_examples/with_endorsable_permissions_examples.rb +89 -0
- data/lib/decidim/core/version.rb +1 -1
- data/lib/decidim/endorsable.rb +25 -0
- data/lib/decidim/events.rb +1 -0
- data/lib/decidim/events/user_group_event.rb +45 -0
- data/lib/decidim/exporters/csv.rb +1 -1
- data/lib/decidim/filter_form_builder.rb +15 -6
- data/lib/decidim/form_builder.rb +209 -23
- data/lib/decidim/has_attachments.rb +1 -1
- data/lib/decidim/participable.rb +6 -0
- data/lib/decidim/participatory_space_manifest.rb +15 -0
- data/lib/decidim/query_extensions.rb +9 -15
- data/lib/decidim/settings_manifest.rb +15 -1
- data/lib/decidim/view_model.rb +4 -0
- data/lib/tasks/decidim_tasks.rake +1 -0
- data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.ro.js +15 -0
- data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.sk.js +14 -0
- data/vendor/assets/javascripts/svg4everybody.min.js +1 -2
- data/vendor/assets/javascripts/tribute.js +11 -4
- metadata +187 -31
- data/app/assets/javascripts/decidim/vizzs/orgchart.js.es6 +0 -699
- data/app/assets/stylesheets/decidim/email.css +0 -1403
- data/app/assets/stylesheets/decidim/modules/_input-hashtags.scss +0 -124
- data/app/resolvers/decidim/core/user_resolver.rb +0 -61
- data/app/views/decidim/messaging/conversations/_message.html.erb +0 -14
@@ -0,0 +1,38 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
# A command with all the business logic to unendorse a resource, both as a user or as a user_group.
|
5
|
+
class UnendorseResource < Rectify::Command
|
6
|
+
# Public: Initializes the command.
|
7
|
+
#
|
8
|
+
# resource - A Decidim::Endorsable object.
|
9
|
+
# current_user - The current user.
|
10
|
+
# current_group- (optional) The current_group that is unendorsing the Resource.
|
11
|
+
def initialize(resource, current_user, current_group = nil)
|
12
|
+
@resource = resource
|
13
|
+
@current_user = current_user
|
14
|
+
@current_group = current_group
|
15
|
+
end
|
16
|
+
|
17
|
+
# Executes the command. Broadcasts these events:
|
18
|
+
#
|
19
|
+
# - :ok when everything is valid, together with the resource.
|
20
|
+
# - :invalid if the form wasn't valid and we couldn't proceed.
|
21
|
+
#
|
22
|
+
# Returns nothing.
|
23
|
+
def call
|
24
|
+
destroy_resource_endorsement
|
25
|
+
broadcast(:ok, @resource)
|
26
|
+
end
|
27
|
+
|
28
|
+
private
|
29
|
+
|
30
|
+
def destroy_resource_endorsement
|
31
|
+
query = @resource.endorsements.where(
|
32
|
+
author: @current_user,
|
33
|
+
decidim_user_group_id: @current_group&.id
|
34
|
+
)
|
35
|
+
query.destroy_all
|
36
|
+
end
|
37
|
+
end
|
38
|
+
end
|
@@ -27,6 +27,7 @@ module Decidim
|
|
27
27
|
@user.email_on_notification = @form.email_on_notification
|
28
28
|
@user.newsletter_notifications_at = @form.newsletter_notifications_at
|
29
29
|
@user.notification_types = @form.notification_types
|
30
|
+
@user.direct_message_types = @form.direct_message_types
|
30
31
|
end
|
31
32
|
end
|
32
33
|
end
|
@@ -21,9 +21,11 @@ module Decidim
|
|
21
21
|
def call
|
22
22
|
return broadcast(:invalid) if form.invalid?
|
23
23
|
|
24
|
+
was_verified = user_group.verified?
|
24
25
|
update_user_group
|
26
|
+
notify_admins if was_verified
|
25
27
|
|
26
|
-
broadcast(:ok,
|
28
|
+
broadcast(:ok, user_group)
|
27
29
|
end
|
28
30
|
|
29
31
|
private
|
@@ -49,5 +51,16 @@ module Decidim
|
|
49
51
|
}
|
50
52
|
}
|
51
53
|
end
|
54
|
+
|
55
|
+
def notify_admins
|
56
|
+
data = {
|
57
|
+
event: "decidim.events.groups.user_group_updated",
|
58
|
+
event_class: Decidim::UserGroupUpdatedEvent,
|
59
|
+
resource: @user_group,
|
60
|
+
affected_users: Decidim::User.org_admins_except_me(form.current_user)
|
61
|
+
}
|
62
|
+
|
63
|
+
Decidim::EventsManager.publish(data)
|
64
|
+
end
|
52
65
|
end
|
53
66
|
end
|
@@ -26,6 +26,19 @@ module Decidim
|
|
26
26
|
managed_user || real_user
|
27
27
|
end
|
28
28
|
|
29
|
+
# Clear the `@real_user` instance variable because otherwise that would be
|
30
|
+
# the return value for any `current_user` calls after the user has already
|
31
|
+
# signed out.
|
32
|
+
# See:
|
33
|
+
# https://github.com/heartcombo/devise/blob/97a6fd289548226d7b0638848259566605418529/lib/devise/controllers/sign_in_out.rb#L80
|
34
|
+
def sign_out(resource_or_scope = nil)
|
35
|
+
result = super
|
36
|
+
|
37
|
+
@real_user = nil
|
38
|
+
|
39
|
+
result
|
40
|
+
end
|
41
|
+
|
29
42
|
def impersonation_session_ends_at
|
30
43
|
@impersonation_session_ends_at ||= impersonation_log.started_at + Decidim::ImpersonationLog::SESSION_TIME_IN_MINUTES.minutes
|
31
44
|
end
|
@@ -0,0 +1,28 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "active_support/concern"
|
4
|
+
|
5
|
+
module Decidim
|
6
|
+
module ResourceVersionsConcern
|
7
|
+
extend ActiveSupport::Concern
|
8
|
+
|
9
|
+
included do
|
10
|
+
helper Decidim::TraceabilityHelper
|
11
|
+
helper_method :current_version, :versioned_resource
|
12
|
+
|
13
|
+
private
|
14
|
+
|
15
|
+
# Overwrite this method in your controller to define how to find the
|
16
|
+
# versioned resource.
|
17
|
+
def versioned_resource
|
18
|
+
raise StandardError, "Not implemented"
|
19
|
+
end
|
20
|
+
|
21
|
+
def current_version
|
22
|
+
return nil unless params[:id].to_i.positive?
|
23
|
+
|
24
|
+
@current_version ||= versioned_resource.versions[params[:id].to_i - 1]
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
@@ -16,14 +16,12 @@ module Decidim
|
|
16
16
|
|
17
17
|
def new
|
18
18
|
@form = form(RegistrationForm).from_params(
|
19
|
-
user: {
|
20
|
-
sign_up_as: "user"
|
21
|
-
}
|
19
|
+
user: { sign_up_as: "user" }
|
22
20
|
)
|
23
21
|
end
|
24
22
|
|
25
23
|
def create
|
26
|
-
@form = form(RegistrationForm).from_params(params[:user])
|
24
|
+
@form = form(RegistrationForm).from_params(params[:user].merge(current_locale: current_locale))
|
27
25
|
|
28
26
|
CreateRegistration.call(@form) do
|
29
27
|
on(:ok) do |user|
|
@@ -12,6 +12,11 @@ module Decidim
|
|
12
12
|
super
|
13
13
|
end
|
14
14
|
|
15
|
+
def destroy
|
16
|
+
current_user.invalidate_all_sessions!
|
17
|
+
super
|
18
|
+
end
|
19
|
+
|
15
20
|
def after_sign_in_path_for(user)
|
16
21
|
if first_login_and_not_authorized?(user) && !user.admin? && !pending_redirect?(user)
|
17
22
|
decidim_verifications.first_login_authorizations_path
|
@@ -0,0 +1,71 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
# Exposes the `Endorsements` so that users can endorse resources.
|
5
|
+
class EndorsementsController < Decidim::Components::BaseController
|
6
|
+
# we need to +include+ to be able to call :endorsement_button from the view
|
7
|
+
include Decidim::EndorsableHelper
|
8
|
+
helper_method :endorsement_button
|
9
|
+
# we need to declare with +helper+ to be able to call :render_endorsement_identity from the views
|
10
|
+
helper Decidim::EndorsableHelper
|
11
|
+
helper_method :resource
|
12
|
+
|
13
|
+
before_action :authenticate_user!
|
14
|
+
|
15
|
+
def create
|
16
|
+
enforce_permission_to :create, :endorsement, resource: resource
|
17
|
+
user_group_id = params[:user_group_id]
|
18
|
+
|
19
|
+
EndorseResource.call(resource, current_user, user_group_id) do
|
20
|
+
on(:ok) do
|
21
|
+
resource.reload
|
22
|
+
render :update_buttons_and_counters
|
23
|
+
end
|
24
|
+
|
25
|
+
on(:invalid) do
|
26
|
+
render json: { error: I18n.t("resource_endorsements.create.error", scope: "decidim") }, status: :unprocessable_entity
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
30
|
+
|
31
|
+
def destroy
|
32
|
+
enforce_permission_to :withdraw, :endorsement, resource: resource
|
33
|
+
user_group_id = params[:user_group_id]
|
34
|
+
user_group = user_groups.find(user_group_id) if user_group_id
|
35
|
+
|
36
|
+
UnendorseResource.call(resource, current_user, user_group) do
|
37
|
+
on(:ok) do
|
38
|
+
resource.reload
|
39
|
+
render :update_buttons_and_counters
|
40
|
+
end
|
41
|
+
end
|
42
|
+
end
|
43
|
+
|
44
|
+
def identities
|
45
|
+
enforce_permission_to :create, :endorsement, resource: resource
|
46
|
+
|
47
|
+
@user_verified_groups = Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
|
48
|
+
render :identities, layout: false
|
49
|
+
end
|
50
|
+
|
51
|
+
# should be pubic in order to be visibe in NeedsPermission#permissions_context
|
52
|
+
def current_component
|
53
|
+
resource.component
|
54
|
+
end
|
55
|
+
|
56
|
+
private
|
57
|
+
|
58
|
+
def user_groups
|
59
|
+
Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
|
60
|
+
end
|
61
|
+
|
62
|
+
def resource
|
63
|
+
gid_param = params[:id] || params[:resource_id]
|
64
|
+
@resource ||= GlobalID::Locator.locate(GlobalID.parse(gid_param))
|
65
|
+
end
|
66
|
+
|
67
|
+
def current_participatory_space
|
68
|
+
current_component.participatory_space
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
@@ -11,22 +11,32 @@ module Decidim
|
|
11
11
|
|
12
12
|
before_action :authenticate_user!
|
13
13
|
|
14
|
-
helper_method :
|
14
|
+
helper_method :conversation, :user_grouped_messages, :sender_is_user?, :user_groups
|
15
15
|
|
16
|
+
# Shows the form to initiate a conversation with an user (the recipient)
|
17
|
+
# recipient is passed via GET parameter:
|
18
|
+
# - if the recipient does not exists, goes back to the users profile page
|
19
|
+
# - if the user already has a conversation with the user, redirects to the initiated conversation
|
16
20
|
def new
|
17
|
-
|
18
|
-
@form = form(ConversationForm).from_params(params)
|
21
|
+
@form = form(ConversationForm).from_params(params, sender: current_user)
|
19
22
|
|
20
|
-
|
23
|
+
if @form.recipient.is_a? Enumerable
|
24
|
+
participants = @form.recipient.to_a.prepend(current_user)
|
25
|
+
conversation = conversation_between_multiple(participants)
|
26
|
+
else
|
27
|
+
conversation = conversation_between(current_user, @form.recipient)
|
28
|
+
end
|
29
|
+
|
30
|
+
return redirect_back(fallback_location: profile_path(current_user.nickname)) if @form.recipient.empty?
|
21
31
|
|
22
|
-
|
23
|
-
|
32
|
+
return redirect_to conversation_path(conversation) if conversation
|
33
|
+
|
34
|
+
enforce_permission_to :create, :conversation, conversation: new_conversation(@form.recipient)
|
24
35
|
end
|
25
36
|
|
26
37
|
def create
|
27
|
-
|
28
|
-
|
29
|
-
@form = form(ConversationForm).from_params(params)
|
38
|
+
@form = form(ConversationForm).from_params(params, sender: current_user)
|
39
|
+
enforce_permission_to :create, :conversation, conversation: new_conversation(@form.recipient)
|
30
40
|
|
31
41
|
StartConversation.call(@form) do
|
32
42
|
on(:ok) do |conversation|
|
@@ -46,6 +56,7 @@ module Decidim
|
|
46
56
|
enforce_permission_to :list, :conversation
|
47
57
|
|
48
58
|
@conversations = UserConversations.for(current_user)
|
59
|
+
@form = MessageForm.new
|
49
60
|
end
|
50
61
|
|
51
62
|
def show
|
@@ -59,7 +70,7 @@ module Decidim
|
|
59
70
|
def update
|
60
71
|
enforce_permission_to :update, :conversation, conversation: conversation
|
61
72
|
|
62
|
-
@form = form(MessageForm).from_params(params)
|
73
|
+
@form = form(MessageForm).from_params(params, sender: current_user)
|
63
74
|
|
64
75
|
ReplyToConversation.call(conversation, @form) do
|
65
76
|
on(:ok) do |message|
|
@@ -72,14 +83,43 @@ module Decidim
|
|
72
83
|
end
|
73
84
|
end
|
74
85
|
|
86
|
+
def check_multiple
|
87
|
+
@form = form(ConversationForm).from_params(params, sender: current_user)
|
88
|
+
redirect_link = current_or_new_conversation_path_with_multiple(@form.recipient)
|
89
|
+
redirect_to redirect_link
|
90
|
+
end
|
91
|
+
|
75
92
|
private
|
76
93
|
|
94
|
+
def user_groups
|
95
|
+
return [] unless current_organization.user_groups_enabled?
|
96
|
+
|
97
|
+
current_user.manageable_user_groups
|
98
|
+
end
|
99
|
+
|
77
100
|
def conversation
|
78
101
|
@conversation ||= Conversation.find(params[:id])
|
79
102
|
end
|
80
103
|
|
81
|
-
def
|
82
|
-
|
104
|
+
def new_conversation(recipient)
|
105
|
+
return nil unless recipient
|
106
|
+
|
107
|
+
if recipient.is_a? Enumerable
|
108
|
+
Conversation.new(participants: [current_user] + recipient)
|
109
|
+
else
|
110
|
+
Conversation.new(participants: [current_user, recipient])
|
111
|
+
end
|
112
|
+
end
|
113
|
+
|
114
|
+
# allows to group all consecutive messages from the same sender
|
115
|
+
# so certain parameters can be displayed only once (such as the
|
116
|
+
# name of the sender)
|
117
|
+
def user_grouped_messages
|
118
|
+
conversation.messages.includes(:sender).chunk(&:sender)
|
119
|
+
end
|
120
|
+
|
121
|
+
def sender_is_user?(sender)
|
122
|
+
current_user.id == sender.id
|
83
123
|
end
|
84
124
|
end
|
85
125
|
end
|
@@ -3,7 +3,8 @@
|
|
3
3
|
module Decidim
|
4
4
|
# The controller to show the newsletter on the website.
|
5
5
|
class NewslettersController < Decidim::ApplicationController
|
6
|
-
layout "decidim/
|
6
|
+
layout "decidim/newsletter_base", only: [:show]
|
7
|
+
|
7
8
|
helper Decidim::SanitizeHelper
|
8
9
|
include Decidim::NewslettersHelper
|
9
10
|
|
@@ -16,7 +17,6 @@ module Decidim
|
|
16
17
|
raise ActionController::RoutingError, "Not Found" unless newsletter.sent?
|
17
18
|
|
18
19
|
@encrypted_token = Decidim::NewsletterEncryptor.sent_at_encrypted(@user.id, newsletter.sent_at) if @user.present?
|
19
|
-
@body = parse_interpolations(newsletter.body[I18n.locale.to_s], @user, newsletter.id)
|
20
20
|
end
|
21
21
|
|
22
22
|
def unsubscribe
|
@@ -22,16 +22,19 @@ module Decidim
|
|
22
22
|
|
23
23
|
def following
|
24
24
|
@content_cell = "decidim/following"
|
25
|
+
@title_key = "following"
|
25
26
|
render :show
|
26
27
|
end
|
27
28
|
|
28
29
|
def followers
|
29
30
|
@content_cell = "decidim/followers"
|
31
|
+
@title_key = "followers"
|
30
32
|
render :show
|
31
33
|
end
|
32
34
|
|
33
35
|
def badges
|
34
36
|
@content_cell = "decidim/badges"
|
37
|
+
@title_key = "badges"
|
35
38
|
render :show
|
36
39
|
end
|
37
40
|
|
@@ -39,6 +42,7 @@ module Decidim
|
|
39
42
|
enforce_user_groups_enabled
|
40
43
|
|
41
44
|
@content_cell = "decidim/groups"
|
45
|
+
@title_key = "groups"
|
42
46
|
render :show
|
43
47
|
end
|
44
48
|
|
@@ -46,11 +50,13 @@ module Decidim
|
|
46
50
|
enforce_user_groups_enabled
|
47
51
|
|
48
52
|
@content_cell = "decidim/members"
|
53
|
+
@title_key = "members"
|
49
54
|
render :show
|
50
55
|
end
|
51
56
|
|
52
57
|
def activity
|
53
58
|
@content_cell = "decidim/user_activity"
|
59
|
+
@title_key = "activity"
|
54
60
|
render :show
|
55
61
|
end
|
56
62
|
|
@@ -30,6 +30,7 @@ module Decidim
|
|
30
30
|
current: (current || root),
|
31
31
|
scopes: scopes&.order(name: :asc),
|
32
32
|
parent_scopes: parent_scopes,
|
33
|
+
picker_target_id: (params[:target_element_id] || "content"),
|
33
34
|
global_value: params[:global_value],
|
34
35
|
max_depth: max_depth,
|
35
36
|
context: context
|
@@ -5,9 +5,10 @@ module Decidim
|
|
5
5
|
class UserActivitiesController < Decidim::ApplicationController
|
6
6
|
include Paginable
|
7
7
|
include UserGroups
|
8
|
+
include FilterResource
|
8
9
|
|
9
10
|
helper Decidim::ResourceHelper
|
10
|
-
helper_method :activities, :user
|
11
|
+
helper_method :activities, :resource_types, :user
|
11
12
|
|
12
13
|
private
|
13
14
|
|
@@ -20,9 +21,25 @@ module Decidim
|
|
20
21
|
ActivitySearch.new(
|
21
22
|
organization: current_organization,
|
22
23
|
user: user,
|
23
|
-
resource_type: "all"
|
24
|
+
resource_type: "all",
|
25
|
+
resource_name: filter.resource_type
|
24
26
|
).run
|
25
27
|
)
|
26
28
|
end
|
29
|
+
|
30
|
+
def default_filter_params
|
31
|
+
{ resource_type: nil }
|
32
|
+
end
|
33
|
+
|
34
|
+
def resource_types
|
35
|
+
@resource_types = %w(Decidim::Proposals::CollaborativeDraft
|
36
|
+
Decidim::Comments::Comment
|
37
|
+
Decidim::Debates::Debate
|
38
|
+
Decidim::Initiative
|
39
|
+
Decidim::Meetings::Meeting
|
40
|
+
Decidim::Blogs::Post
|
41
|
+
Decidim::Proposals::Proposal
|
42
|
+
Decidim::Consultations::Question)
|
43
|
+
end
|
27
44
|
end
|
28
45
|
end
|
@@ -0,0 +1,142 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
# The controller to show all the conversations for a user or group
|
5
|
+
# This controller places conversations in the public profile page.
|
6
|
+
# Only for groups at the moment but it will make conversations_controller
|
7
|
+
# obsolete in the future
|
8
|
+
class UserConversationsController < Decidim::ApplicationController
|
9
|
+
include Paginable
|
10
|
+
include UserGroups
|
11
|
+
include FormFactory
|
12
|
+
include Messaging::ConversationHelper
|
13
|
+
|
14
|
+
before_action :authenticate_user!
|
15
|
+
before_action :ensure_profile_manager
|
16
|
+
|
17
|
+
helper Decidim::ResourceHelper
|
18
|
+
helper_method :user, :conversations, :conversation
|
19
|
+
|
20
|
+
# overwrite original rescue_from to ensure we print messages from ajax methods (update)
|
21
|
+
rescue_from Decidim::ActionForbidden, with: :ajax_user_has_no_permission
|
22
|
+
|
23
|
+
def index
|
24
|
+
enforce_permission_to :list, :conversation, interlocutor: user
|
25
|
+
end
|
26
|
+
|
27
|
+
# shows a conversation thread and presents a form to reply in ajax
|
28
|
+
def show
|
29
|
+
enforce_permission_to :show, :conversation, interlocutor: user, conversation: conversation
|
30
|
+
|
31
|
+
conversation.mark_as_read(current_user)
|
32
|
+
end
|
33
|
+
|
34
|
+
# receive replies in ajax, messages are returned through the view update.js.erb and printed
|
35
|
+
# over the form instead of using flash messages
|
36
|
+
def update
|
37
|
+
enforce_permission_to :update, :conversation, interlocutor: user, conversation: conversation
|
38
|
+
|
39
|
+
@form = form(Messaging::MessageForm).from_params(params, sender: user)
|
40
|
+
|
41
|
+
Messaging::ReplyToConversation.call(conversation, @form) do
|
42
|
+
on(:ok) do |message|
|
43
|
+
render action: :update, locals: { message: message }
|
44
|
+
end
|
45
|
+
|
46
|
+
on(:invalid) do
|
47
|
+
render_unprocessable_entity I18n.t("user_conversations.update.error", scope: "decidim")
|
48
|
+
end
|
49
|
+
end
|
50
|
+
end
|
51
|
+
|
52
|
+
# Shows the form to initiate a conversation with one or more users/groups (the recipients)
|
53
|
+
# recipients are passed via GET parameters:
|
54
|
+
# - if no recipient are valid, redirects back to the users profile page
|
55
|
+
# - if the user already has a conversation with the user(s), redirects to the initiated conversation
|
56
|
+
def new
|
57
|
+
@form = form(Messaging::ConversationForm).from_params(params, sender: user)
|
58
|
+
|
59
|
+
return redirect_back(fallback_location: profile_path(user.nickname)) if @form.recipient.empty?
|
60
|
+
|
61
|
+
@conversation = new_conversation(@form.recipient)
|
62
|
+
|
63
|
+
# redirect to existing conversation if already started
|
64
|
+
return redirect_to profile_conversation_path(nickname: user.nickname, id: @conversation.id) if @conversation.id
|
65
|
+
|
66
|
+
enforce_permission_to :create, :conversation, interlocutor: user, conversation: @conversation
|
67
|
+
|
68
|
+
render :show
|
69
|
+
end
|
70
|
+
|
71
|
+
def create
|
72
|
+
@form = form(Messaging::ConversationForm).from_params(params, sender: user)
|
73
|
+
@conversation = new_conversation(@form.recipient)
|
74
|
+
|
75
|
+
enforce_permission_to :create, :conversation, interlocutor: user, conversation: @conversation
|
76
|
+
|
77
|
+
# do not allow to create multiple conversation to the same actors if already started
|
78
|
+
if @conversation.id
|
79
|
+
flash[:alert] = I18n.t("user_conversations.create.existing_error", scope: "decidim")
|
80
|
+
return redirect_to profile_conversation_path(nickname: user.nickname, id: @conversation.id)
|
81
|
+
end
|
82
|
+
Messaging::StartConversation.call(@form) do
|
83
|
+
on(:ok) do |_conversation|
|
84
|
+
flash[:notice] = I18n.t("user_conversations.create.success", scope: "decidim")
|
85
|
+
return redirect_to profile_conversations_path(nickname: user.nickname)
|
86
|
+
end
|
87
|
+
on(:invalid) do
|
88
|
+
flash[:alert] = I18n.t("user_conversations.create.error", scope: "decidim")
|
89
|
+
render action: :show
|
90
|
+
end
|
91
|
+
end
|
92
|
+
end
|
93
|
+
|
94
|
+
private
|
95
|
+
|
96
|
+
# Rescue ajax calls and print the update.js view which prints the info on the message ajax form
|
97
|
+
# Only if the request is AJAX, otherwise behave as Decidim standards
|
98
|
+
def ajax_user_has_no_permission
|
99
|
+
return user_has_no_permission unless request.xhr?
|
100
|
+
|
101
|
+
render_unprocessable_entity I18n.t("actions.unauthorized", scope: "decidim.core")
|
102
|
+
end
|
103
|
+
|
104
|
+
def render_unprocessable_entity(message)
|
105
|
+
render action: :update, locals: { error: message }, status: :unprocessable_entity
|
106
|
+
end
|
107
|
+
|
108
|
+
def user
|
109
|
+
@user ||= Decidim::UserBaseEntity.find_by(nickname: params[:nickname], organization: current_organization)
|
110
|
+
end
|
111
|
+
|
112
|
+
def conversations
|
113
|
+
paginate(Messaging::UserConversations.for(user))
|
114
|
+
end
|
115
|
+
|
116
|
+
def conversation
|
117
|
+
@conversation ||= Messaging::Conversation.find(params[:id])
|
118
|
+
end
|
119
|
+
|
120
|
+
def new_conversation(recipients)
|
121
|
+
conversation = conversation_between_multiple([user] + recipients)
|
122
|
+
return conversation if conversation
|
123
|
+
|
124
|
+
Messaging::Conversation.new(participants: [user] + recipients)
|
125
|
+
end
|
126
|
+
|
127
|
+
def ensure_profile_manager
|
128
|
+
return if user.is_a?(UserGroup) && current_user.manageable_user_groups.include?(user)
|
129
|
+
|
130
|
+
# For the moment, this controller is only for UserGroup profiles,
|
131
|
+
# next line may be removed if in the future user conversations are handled in the
|
132
|
+
# profile page as well
|
133
|
+
return redirect_to conversations_path if user == current_user
|
134
|
+
|
135
|
+
# if the previous line is removed, next must be uncommented to ensure only authorized
|
136
|
+
# users access to the page
|
137
|
+
# return if user == current_user
|
138
|
+
|
139
|
+
raise ActionController::RoutingError, "Conversation not found"
|
140
|
+
end
|
141
|
+
end
|
142
|
+
end
|