decidim-core 0.15.2 → 0.16.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/README.md +14 -1
- data/app/assets/config/decidim_core_manifest.js +14 -12
- data/app/assets/images/decidim/pattern.png +0 -0
- data/app/assets/javascripts/decidim.js.es6 +4 -0
- data/app/assets/javascripts/decidim/floating_help.js.es6 +40 -0
- data/app/assets/javascripts/decidim/input_hashtags.js.es6 +6 -4
- data/app/assets/javascripts/decidim/notifications.js.es6 +1 -1
- data/app/assets/javascripts/decidim/tooltip_keep_on_hover.js.es6 +18 -0
- data/app/assets/javascripts/decidim/vizzs/areachart.js.es6 +52 -10
- data/app/assets/javascripts/decidim/vizzs/metrics.js.es6 +68 -22
- data/app/assets/javascripts/decidim/vizzs/orgchart.js.es6 +10 -13
- data/app/assets/stylesheets/decidim/conference-diploma.css.scss +61 -0
- data/app/assets/stylesheets/decidim/layouts/_home.scss +1 -1
- data/app/assets/stylesheets/decidim/modules/_buttons.scss +4 -0
- data/app/assets/stylesheets/decidim/modules/_cards.scss +17 -1
- data/app/assets/stylesheets/decidim/modules/_conference-programme.scss +0 -4
- data/app/assets/stylesheets/decidim/modules/_filters.scss +37 -2
- data/app/assets/stylesheets/decidim/modules/_floating-helper.scss +106 -0
- data/app/assets/stylesheets/decidim/modules/_forms.scss +22 -0
- data/app/assets/stylesheets/decidim/modules/_help.scss +4 -0
- data/app/assets/stylesheets/decidim/modules/_layout.scss +1 -0
- data/app/assets/stylesheets/decidim/modules/_margins.scss +1 -0
- data/app/assets/stylesheets/decidim/modules/_modules.scss +1 -1
- data/app/assets/stylesheets/decidim/modules/_navbar.scss +5 -1
- data/app/assets/stylesheets/decidim/modules/_order-by.scss +11 -1
- data/app/assets/stylesheets/decidim/modules/_process-header.scss +36 -38
- data/app/assets/stylesheets/decidim/modules/_process-nav.scss +61 -10
- data/app/assets/stylesheets/decidim/modules/_process-phase.scss +63 -30
- data/app/assets/stylesheets/decidim/modules/_share.scss +4 -0
- data/app/assets/stylesheets/decidim/modules/_typography.scss +17 -0
- data/app/assets/stylesheets/decidim/{modules → vizzs}/_orgchart.scss +2 -10
- data/app/cells/decidim/activities_cell.rb +6 -2
- data/app/cells/decidim/activity/show.erb +22 -19
- data/app/cells/decidim/activity_cell.rb +35 -5
- data/app/cells/decidim/amendable/amend_button_card/show.erb +9 -0
- data/app/cells/decidim/amendable/amend_button_card_cell.rb +43 -0
- data/app/cells/decidim/amendable/amenders_list/show.erb +18 -0
- data/app/cells/decidim/amendable/amenders_list_cell.rb +7 -0
- data/app/cells/decidim/amendable/announcement_cell.rb +58 -0
- data/app/cells/decidim/amendable/emendation_actions/show.erb +13 -0
- data/app/cells/decidim/amendable/emendation_actions_cell.rb +52 -0
- data/app/cells/decidim/amendable/promote_button_card/show.erb +9 -0
- data/app/cells/decidim/amendable/promote_button_card_cell.rb +47 -0
- data/app/cells/decidim/author/profile_inline.erb +23 -4
- data/app/cells/decidim/author/profile_minicard.erb +25 -0
- data/app/cells/decidim/author/show.erb +0 -1
- data/app/cells/decidim/author_cell.rb +6 -0
- data/app/cells/decidim/card_cell.rb +2 -4
- data/app/cells/decidim/card_m/top.erb +1 -1
- data/app/cells/decidim/card_m_cell.rb +3 -0
- data/app/cells/decidim/content_blocks/last_activity_cell.rb +1 -1
- data/app/cells/decidim/follow_button/show.erb +0 -1
- data/app/cells/decidim/follow_button_cell.rb +10 -0
- data/app/cells/decidim/following/show.erb +1 -1
- data/app/cells/decidim/following_cell.rb +1 -1
- data/app/cells/decidim/notifications/show.erb +1 -0
- data/app/cells/decidim/pad_iframe/show.erb +14 -0
- data/app/cells/decidim/pad_iframe_cell.rb +57 -0
- data/app/cells/decidim/profile/user_tabs.erb +8 -6
- data/app/cells/decidim/profile_cell.rb +1 -1
- data/app/cells/decidim/profile_sidebar/show.erb +58 -42
- data/app/cells/decidim/profile_sidebar_cell.rb +6 -0
- data/app/cells/decidim/search_results/show.erb +8 -0
- data/app/cells/decidim/search_results_cell.rb +38 -0
- data/app/cells/decidim/search_results_section/show.erb +24 -0
- data/app/cells/decidim/search_results_section_cell.rb +35 -0
- data/app/cells/decidim/user_activity/show.erb +15 -0
- data/app/cells/decidim/user_activity_cell.rb +17 -0
- data/app/cells/decidim/user_profile/header.erb +1 -16
- data/app/cells/decidim/user_profile/user_data.erb +16 -0
- data/app/cells/decidim/user_profile_cell.rb +4 -0
- data/app/cells/decidim/user_timeline/show.erb +15 -0
- data/app/cells/decidim/user_timeline_cell.rb +17 -0
- data/app/commands/decidim/accept_user_group_join_request.rb +1 -1
- data/app/commands/decidim/amendable/accept.rb +84 -0
- data/app/commands/decidim/amendable/create.rb +103 -0
- data/app/commands/decidim/amendable/promote.rb +79 -0
- data/app/commands/decidim/amendable/reject.rb +60 -0
- data/app/commands/decidim/amendable/withdraw.rb +46 -0
- data/app/commands/decidim/create_omniauth_registration.rb +17 -1
- data/app/commands/decidim/create_registration.rb +2 -0
- data/app/commands/decidim/demote_membership.rb +1 -1
- data/app/commands/decidim/invite_user.rb +1 -1
- data/app/commands/decidim/invite_user_to_group.rb +1 -1
- data/app/commands/decidim/join_user_group.rb +1 -7
- data/app/commands/decidim/messaging/reply_to_conversation.rb +1 -1
- data/app/commands/decidim/promote_membership.rb +1 -1
- data/app/commands/decidim/reject_user_group_join_request.rb +1 -1
- data/app/commands/decidim/remove_user_from_group.rb +1 -1
- data/app/commands/decidim/search.rb +65 -16
- data/app/commands/decidim/update_account.rb +1 -1
- data/app/commands/decidim/update_notifications_settings.rb +2 -1
- data/app/commands/decidim/update_user_interests.rb +35 -0
- data/app/controllers/concerns/decidim/amendments_controller.rb +104 -0
- data/app/controllers/concerns/decidim/participatory_space_context.rb +28 -6
- data/app/controllers/concerns/decidim/user_groups.rb +23 -0
- data/app/controllers/concerns/decidim/user_profile.rb +2 -4
- data/app/controllers/decidim/components/base_controller.rb +1 -0
- data/app/controllers/decidim/devise/confirmations_controller.rb +9 -0
- data/app/controllers/decidim/devise/omniauth_registrations_controller.rb +2 -1
- data/app/controllers/decidim/devise/passwords_controller.rb +6 -0
- data/app/controllers/decidim/devise/registrations_controller.rb +5 -0
- data/app/controllers/decidim/devise/sessions_controller.rb +12 -0
- data/app/controllers/decidim/group_admins_controller.rb +3 -0
- data/app/controllers/decidim/group_email_confirmations_controller.rb +32 -0
- data/app/controllers/decidim/group_invites_controller.rb +3 -0
- data/app/controllers/decidim/group_members_controller.rb +3 -0
- data/app/controllers/decidim/groups_controller.rb +3 -0
- data/app/controllers/decidim/homepage_controller.rb +10 -0
- data/app/controllers/decidim/last_activities_controller.rb +1 -1
- data/app/controllers/decidim/messaging/conversations_controller.rb +11 -2
- data/app/controllers/decidim/open_data_controller.rb +31 -0
- data/app/controllers/decidim/own_user_groups_controller.rb +3 -1
- data/app/controllers/decidim/pages_controller.rb +7 -15
- data/app/controllers/decidim/profiles_controller.rb +13 -2
- data/app/controllers/decidim/searches_controller.rb +11 -2
- data/app/controllers/decidim/user_activities_controller.rb +28 -0
- data/app/controllers/decidim/user_group_join_requests_controller.rb +3 -0
- data/app/controllers/decidim/user_interests_controller.rb +32 -0
- data/app/controllers/decidim/user_timeline_controller.rb +40 -0
- data/app/events/decidim/amendable/amendment_accepted_event.rb +23 -0
- data/app/events/decidim/amendable/amendment_base_event.rb +39 -0
- data/app/events/decidim/amendable/amendment_created_event.rb +23 -0
- data/app/events/decidim/amendable/amendment_rejected_event.rb +23 -0
- data/app/events/decidim/amendable/emendation_promoted_event.rb +23 -0
- data/app/events/decidim/welcome_notification_event.rb +58 -0
- data/app/forms/decidim/amendable/create_form.rb +54 -0
- data/app/forms/decidim/amendable/form.rb +22 -0
- data/app/forms/decidim/amendable/promote_form.rb +26 -0
- data/app/forms/decidim/amendable/reject_form.rb +14 -0
- data/app/forms/decidim/amendable/review_form.rb +35 -0
- data/app/forms/decidim/notifications_settings_form.rb +19 -6
- data/app/forms/decidim/omniauth_registration_form.rb +2 -1
- data/app/forms/decidim/user_group_form.rb +1 -2
- data/app/forms/decidim/user_interest_scope_form.rb +25 -0
- data/app/forms/decidim/user_interests_form.rb +22 -0
- data/app/helpers/decidim/amendments_helper.rb +130 -0
- data/app/helpers/decidim/application_helper.rb +19 -2
- data/app/helpers/decidim/card_helper.rb +0 -2
- data/app/helpers/decidim/cells_paginate_helper.rb +4 -0
- data/app/helpers/decidim/contextual_help_helper.rb +10 -0
- data/app/helpers/decidim/cta_button_helper.rb +3 -1
- data/app/helpers/decidim/decidim_form_helper.rb +1 -1
- data/app/helpers/decidim/layout_helper.rb +13 -0
- data/app/helpers/decidim/multi_translation_helper.rb +0 -0
- data/app/helpers/decidim/omniauth_helper.rb +9 -1
- data/app/helpers/decidim/pad_helper.rb +16 -0
- data/app/helpers/decidim/participatory_space_helpers.rb +15 -0
- data/app/helpers/decidim/searches_helper.rb +50 -6
- data/app/helpers/decidim/translations_helper.rb +3 -2
- data/app/jobs/decidim/email_notification_generator_job.rb +4 -2
- data/app/jobs/decidim/metric_job.rb +1 -1
- data/app/jobs/decidim/notification_generator_for_recipient_job.rb +2 -2
- data/app/jobs/decidim/notification_generator_job.rb +4 -2
- data/app/jobs/decidim/open_data_job.rb +16 -0
- data/app/mailers/decidim/messaging/conversation_mailer.rb +5 -2
- data/app/mailers/decidim/newsletter_mailer.rb +6 -2
- data/app/mailers/decidim/notification_mailer.rb +2 -2
- data/app/models/decidim/action_log.rb +7 -0
- data/app/models/decidim/amendment.rb +17 -0
- data/app/models/decidim/component.rb +8 -0
- data/app/models/decidim/contextual_help_section.rb +41 -0
- data/app/models/decidim/follow.rb +30 -0
- data/app/models/decidim/notification.rb +11 -1
- data/app/models/decidim/organization.rb +41 -0
- data/app/models/decidim/searchable_resource.rb +3 -0
- data/app/models/decidim/static_page.rb +11 -0
- data/app/models/decidim/static_page_topic.rb +12 -0
- data/app/models/decidim/user.rb +25 -2
- data/app/models/decidim/user_base_entity.rb +0 -6
- data/app/models/decidim/user_group.rb +29 -3
- data/app/permissions/decidim/permissions.rb +12 -0
- data/app/presenters/decidim/admin_log/organization_presenter.rb +13 -0
- data/app/presenters/decidim/admin_log/user_group_presenter.rb +1 -1
- data/app/presenters/decidim/admin_log/user_presenter.rb +1 -1
- data/app/presenters/decidim/hashtag_presenter.rb +7 -2
- data/app/presenters/decidim/metric_charts_presenter.rb +54 -21
- data/app/presenters/decidim/user_presenter.rb +4 -8
- data/app/queries/decidim/messaging/user_conversations.rb +1 -1
- data/app/queries/decidim/metric_manage.rb +16 -2
- data/app/queries/decidim/metric_measure.rb +35 -0
- data/app/queries/decidim/metrics/followers_metric_manage.rb +64 -0
- data/app/queries/decidim/metrics/participants_metric_manage.rb +72 -0
- data/app/queries/decidim/metrics/users_metric_manage.rb +1 -1
- data/app/queries/decidim/public_components.rb +32 -0
- data/app/resolvers/decidim/core/metric_resolver.rb +43 -11
- data/app/services/decidim/action_logger.rb +10 -0
- data/app/services/decidim/activity_search.rb +88 -13
- data/app/services/decidim/email_notification_generator.rb +23 -8
- data/app/services/decidim/events_manager.rb +9 -3
- data/app/services/decidim/home_activity_search.rb +80 -0
- data/app/services/decidim/log/diff_changeset_calculator.rb +3 -1
- data/app/services/decidim/notification_generator.rb +19 -7
- data/app/services/decidim/notification_generator_for_recipient.rb +6 -9
- data/app/services/decidim/open_data_exporter.rb +55 -0
- data/app/uploaders/decidim/open_data_uploader.rb +17 -0
- data/app/views/decidim/amendments/_form.html.erb +30 -0
- data/app/views/decidim/amendments/_review_form.html.erb +19 -0
- data/app/views/decidim/amendments/new.html.erb +29 -0
- data/app/views/decidim/amendments/review.html.erb +33 -0
- data/app/views/decidim/devise/registrations/new.html.erb +2 -2
- data/app/views/decidim/devise/sessions/new.html.erb +42 -29
- data/app/views/decidim/devise/shared/_links.html.erb +3 -3
- data/app/views/decidim/devise/shared/_omniauth_buttons.html.erb +7 -5
- data/app/views/decidim/follows/update_button.js.erb +1 -1
- data/app/views/decidim/group_members/index.html.erb +1 -1
- data/app/views/decidim/groups/_form.html.erb +9 -8
- data/app/views/decidim/groups/new.html.erb +3 -0
- data/app/views/decidim/{pages/home.html.erb → homepage/show.html.erb} +0 -0
- data/app/views/decidim/messaging/conversation_mailer/new_conversation.html.erb +6 -0
- data/app/views/decidim/messaging/conversation_mailer/new_message.html.erb +6 -0
- data/app/views/decidim/messaging/conversations/_message.html.erb +14 -0
- data/app/views/decidim/messaging/conversations/_reply.html.erb +11 -0
- data/app/views/decidim/messaging/conversations/_show.html.erb +21 -0
- data/app/views/decidim/messaging/conversations/_start.html.erb +12 -0
- data/app/views/decidim/messaging/conversations/create.js.erb +1 -1
- data/app/views/decidim/messaging/conversations/index.html.erb +51 -1
- data/app/views/decidim/messaging/conversations/new.html.erb +5 -1
- data/app/views/decidim/messaging/conversations/show.html.erb +9 -1
- data/app/views/decidim/messaging/conversations/update.js.erb +1 -1
- data/app/views/decidim/notification_mailer/event_received.html.erb +13 -3
- data/app/views/decidim/notifications/index.html.erb +5 -1
- data/app/views/decidim/notifications_settings/show.html.erb +19 -0
- data/app/views/decidim/pages/_standalone.html.erb +21 -0
- data/app/views/decidim/pages/_tabbed.html.erb +45 -0
- data/app/views/decidim/pages/index.html.erb +68 -29
- data/app/views/decidim/pages/show.html.erb +28 -0
- data/app/views/decidim/profiles/show.html.erb +1 -1
- data/app/views/decidim/searches/_count.html.erb +26 -1
- data/app/views/decidim/searches/_filters.html.erb +40 -17
- data/app/views/decidim/searches/index.html.erb +5 -16
- data/app/views/decidim/searches/index.js.erb +5 -3
- data/app/views/decidim/shared/_extended_navigation_bar.html.erb +50 -0
- data/app/views/decidim/shared/_floating_help.html.erb +30 -0
- data/app/views/decidim/shared/_follow_button.html.erb +1 -1
- data/app/views/decidim/shared/_login_modal.html.erb +35 -22
- data/app/views/decidim/shared/_results_per_page.html.erb +1 -1
- data/app/views/decidim/shared/_share_modal.html.erb +1 -1
- data/app/views/decidim/user_activities/index.html.erb +5 -0
- data/app/views/decidim/user_interests/_areas.html.erb +14 -0
- data/app/views/decidim/user_interests/_scopes.html.erb +15 -0
- data/app/views/decidim/user_interests/show.html.erb +12 -0
- data/app/views/decidim/user_timeline/index.html.erb +4 -0
- data/app/views/layouts/decidim/_user_menu.html.erb +1 -1
- data/app/views/layouts/decidim/_wrapper.html.erb +12 -5
- data/config/locales/ca.yml +199 -13
- data/config/locales/de.yml +200 -13
- data/config/locales/en.yml +200 -13
- data/config/locales/es-PY.yml +200 -13
- data/config/locales/es.yml +200 -13
- data/config/locales/eu.yml +200 -13
- data/config/locales/fi-pl.yml +200 -13
- data/config/locales/fi.yml +200 -13
- data/config/locales/fr.yml +200 -13
- data/config/locales/gl.yml +200 -13
- data/config/locales/hu.yml +200 -13
- data/config/locales/id-ID.yml +198 -13
- data/config/locales/it.yml +200 -13
- data/config/locales/nl.yml +200 -13
- data/config/locales/pl.yml +204 -13
- data/config/locales/pt-BR.yml +200 -13
- data/config/locales/pt.yml +200 -13
- data/config/locales/ru.yml +2 -16
- data/config/locales/sv.yml +200 -13
- data/config/locales/tr-TR.yml +200 -13
- data/config/locales/uk.yml +2 -16
- data/config/routes.rb +27 -1
- data/db/migrate/20171212103803_create_unique_nicknames.rb +1 -1
- data/db/migrate/20180221101934_fix_nickname_index.rb +1 -1
- data/db/migrate/20180706104107_add_nickname_to_managed_users.rb +1 -1
- data/db/migrate/20180720114847_create_decidim_amendments.rb +21 -0
- data/db/migrate/20181001124950_move_users_groups_to_users_table.rb +1 -1
- data/db/migrate/20181022090732_add_columns_to_pages.rb +20 -0
- data/db/migrate/20181023104416_add_static_page_topics.rb +15 -0
- data/db/migrate/20181025082245_add_timestamps_to_components.rb +12 -0
- data/db/migrate/20181029121244_add_welcome_notification.rb +13 -0
- data/db/migrate/20181108131058_add_users_registration_mode_to_organizations.rb +7 -0
- data/db/migrate/20181113101935_create_decidim_contextual_help_sections.rb +11 -0
- data/db/migrate/20181115102958_add_following_and_followers_counters_to_users.rb +26 -0
- data/db/migrate/20181119140636_add_columns_to_static_page_topic.rb +10 -0
- data/db/migrate/20181126145142_add_id_documents_fields_to_org.rb +13 -0
- data/db/migrate/20181204110723_remove_following_users_count_from_users.rb +17 -0
- data/db/migrate/20181211080834_add_scope_to_action_logs.rb +7 -0
- data/db/migrate/20181211090933_add_area_to_action_logs.rb +7 -0
- data/db/migrate/20181214101250_add_notification_types_to_users.rb +12 -0
- data/db/migrate/20181218171503_add_user_groups_switch_to_organizations.rb +8 -0
- data/db/seeds.rb +6 -1
- data/lib/decidim/amendable.rb +86 -0
- data/lib/decidim/api/component_interface.rb +4 -0
- data/lib/decidim/api/participatory_space_interface.rb +7 -0
- data/lib/decidim/api/scopable_interface.rb +1 -1
- data/lib/decidim/coauthorable.rb +16 -7
- data/lib/decidim/component_manifest.rb +3 -2
- data/lib/decidim/components/export_manifest.rb +13 -2
- data/lib/decidim/content_parsers/hashtag_parser.rb +48 -15
- data/lib/decidim/content_parsers/user_parser.rb +26 -10
- data/lib/decidim/content_renderers/hashtag_renderer.rb +46 -23
- data/lib/decidim/core.rb +40 -2
- data/lib/decidim/core/engine.rb +46 -12
- data/lib/decidim/core/test.rb +11 -0
- data/lib/decidim/core/test/factories.rb +44 -15
- data/lib/decidim/core/test/shared_examples/amendable/accept_amendment_examples.rb +57 -0
- data/lib/decidim/core/test/shared_examples/amendable/amendment_accepted_event_examples.rb +43 -0
- data/lib/decidim/core/test/shared_examples/amendable/amendment_created_event_examples.rb +48 -0
- data/lib/decidim/core/test/shared_examples/amendable/amendment_form_examples.rb +45 -0
- data/lib/decidim/core/test/shared_examples/amendable/amendment_promoted_event_examples.rb +43 -0
- data/lib/decidim/core/test/shared_examples/amendable/amendment_rejected_event_examples.rb +43 -0
- data/lib/decidim/core/test/shared_examples/amendable/create_amendment_examples.rb +78 -0
- data/lib/decidim/core/test/shared_examples/amendable/promote_amendment_examples.rb +43 -0
- data/lib/decidim/core/test/shared_examples/amendable/reject_amendment_examples.rb +41 -0
- data/lib/decidim/core/test/shared_examples/amendable/withdraw_amendment_examples.rb +29 -0
- data/lib/decidim/core/test/shared_examples/has_contextual_help.rb +30 -0
- data/lib/decidim/core/test/shared_examples/resourceable.rb +17 -0
- data/lib/decidim/core/test/shared_examples/searchable_results_examples.rb +1 -1
- data/lib/decidim/core/test/shared_examples/simple_event.rb +24 -2
- data/lib/decidim/core/version.rb +1 -1
- data/lib/decidim/events/base_event.rb +17 -12
- data/lib/decidim/events/simple_event.rb +21 -2
- data/lib/decidim/form_builder.rb +8 -0
- data/lib/decidim/gamification/badge_scorer.rb +3 -3
- data/lib/decidim/has_component.rb +1 -1
- data/lib/decidim/hashtag.rb +0 -2
- data/lib/decidim/hashtaggable.rb +2 -2
- data/lib/decidim/metric_manifest.rb +17 -2
- data/lib/decidim/metric_operation.rb +59 -0
- data/lib/decidim/metric_operation_manifest.rb +20 -0
- data/lib/decidim/metric_registry.rb +57 -19
- data/lib/decidim/paddable.rb +82 -0
- data/lib/decidim/participable.rb +24 -0
- data/lib/decidim/participatory_space_resourceable.rb +12 -0
- data/lib/decidim/query_extensions.rb +8 -1
- data/lib/decidim/resource_manifest.rb +5 -1
- data/lib/decidim/resourceable.rb +12 -0
- data/lib/decidim/searchable.rb +13 -4
- data/lib/decidim/settings_manifest.rb +2 -1
- data/lib/tasks/decidim_data_portability_tasks.rake +86 -0
- data/lib/tasks/decidim_open_data_tasks.rake +12 -0
- data/lib/tasks/decidim_tasks.rake +1 -83
- data/vendor/assets/javascripts/tribute.js +307 -145
- metadata +156 -22
- data/app/cells/decidim/conversation/show.erb +0 -18
- data/app/cells/decidim/conversation_cell.rb +0 -23
- data/app/cells/decidim/conversation_header/show.erb +0 -17
- data/app/cells/decidim/conversation_header_cell.rb +0 -16
- data/app/cells/decidim/conversations/show.erb +0 -45
- data/app/cells/decidim/conversations_cell.rb +0 -24
- data/app/cells/decidim/message/show.erb +0 -15
- data/app/cells/decidim/message_cell.rb +0 -23
- data/app/cells/decidim/new_conversation/show.erb +0 -19
- data/app/cells/decidim/new_conversation_cell.rb +0 -19
- data/app/views/decidim/pages/decidim_page.html.erb +0 -31
- data/app/views/decidim/searches/_results.html.erb +0 -5
- data/app/views/decidim/shared/_author_reference.html.erb +0 -1
@@ -0,0 +1,15 @@
|
|
1
|
+
<div class="user-activity">
|
2
|
+
<div id="activities" class="columns small-12">
|
3
|
+
<% if activities.length == 0 %>
|
4
|
+
<div class="callout warning">
|
5
|
+
<%= t "decidim.user_activity.index.no_activities_warning" %>
|
6
|
+
</div>
|
7
|
+
<% else %>
|
8
|
+
<div class="row">
|
9
|
+
<%= cell "decidim/activities", activities %>
|
10
|
+
</div>
|
11
|
+
|
12
|
+
<%= decidim_paginate activities %>
|
13
|
+
<% end %>
|
14
|
+
</div>
|
15
|
+
</div>
|
@@ -0,0 +1,17 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
class UserTimelineCell < Decidim::ViewModel
|
5
|
+
include Cell::ViewModel::Partial
|
6
|
+
include CellsPaginateHelper
|
7
|
+
include Decidim::Core::Engine.routes.url_helpers
|
8
|
+
|
9
|
+
def show
|
10
|
+
render :show
|
11
|
+
end
|
12
|
+
|
13
|
+
def activities
|
14
|
+
context[:activities]
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
@@ -42,7 +42,7 @@ module Decidim
|
|
42
42
|
event: "decidim.events.groups.join_request_accepted",
|
43
43
|
event_class: JoinRequestAcceptedEvent,
|
44
44
|
resource: membership.user_group,
|
45
|
-
|
45
|
+
affected_users: [membership.user],
|
46
46
|
extra: {
|
47
47
|
user_group_name: membership.user_group.name,
|
48
48
|
user_group_nickname: membership.user_group.nickname
|
@@ -0,0 +1,84 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module Amendable
|
5
|
+
# A command with all the business logic to accept an amend.
|
6
|
+
class Accept < Rectify::Command
|
7
|
+
# Public: Initializes the command.
|
8
|
+
#
|
9
|
+
# form - A form object with the params.
|
10
|
+
# amendable - The resource that is being amended.
|
11
|
+
def initialize(form)
|
12
|
+
@form = form
|
13
|
+
@amendment = form.amendment
|
14
|
+
@amendable = form.amendable
|
15
|
+
@emendation = form.emendation
|
16
|
+
@amender = form.emendation.creator_author
|
17
|
+
end
|
18
|
+
|
19
|
+
# Executes the command. Broadcasts these events:
|
20
|
+
#
|
21
|
+
# - :ok when everything is valid, together with the amend.
|
22
|
+
# - :invalid if the form wasn't valid and we couldn't proceed.
|
23
|
+
#
|
24
|
+
# Returns nothing.
|
25
|
+
def call
|
26
|
+
return broadcast(:invalid) if @form.invalid?
|
27
|
+
|
28
|
+
transaction do
|
29
|
+
accept_amendment!
|
30
|
+
update_amendable!
|
31
|
+
notify_amendable_and_emendation_authors_and_followers
|
32
|
+
end
|
33
|
+
|
34
|
+
broadcast(:ok, @amendable)
|
35
|
+
end
|
36
|
+
|
37
|
+
private
|
38
|
+
|
39
|
+
def accept_amendment!
|
40
|
+
@amendment = Decidim.traceability.update!(
|
41
|
+
@amendment,
|
42
|
+
@amendable.creator_author,
|
43
|
+
{ state: "accepted" },
|
44
|
+
visibility: "public-only"
|
45
|
+
)
|
46
|
+
end
|
47
|
+
|
48
|
+
def update_amendable!
|
49
|
+
@amendable = Decidim.traceability.update!(
|
50
|
+
@amendable,
|
51
|
+
emendation_author,
|
52
|
+
amendable_attributes,
|
53
|
+
visibility: "public-only"
|
54
|
+
)
|
55
|
+
@amendable.add_coauthor(@amender, user_group: nil)
|
56
|
+
end
|
57
|
+
|
58
|
+
def emendation_author
|
59
|
+
return @emendation.creator.user_group if @emendation.creator.user_group
|
60
|
+
@emendation.creator_author
|
61
|
+
end
|
62
|
+
|
63
|
+
def amendable_attributes
|
64
|
+
{
|
65
|
+
title: @form.title,
|
66
|
+
body: @form.body
|
67
|
+
}
|
68
|
+
end
|
69
|
+
|
70
|
+
def notify_amendable_and_emendation_authors_and_followers
|
71
|
+
affected_users = @emendation.authors + @amendable.authors
|
72
|
+
followers = @emendation.followers + @amendable.followers - affected_users
|
73
|
+
|
74
|
+
Decidim::EventsManager.publish(
|
75
|
+
event: "decidim.events.amendments.amendment_accepted",
|
76
|
+
event_class: Decidim::Amendable::AmendmentAcceptedEvent,
|
77
|
+
resource: @emendation,
|
78
|
+
affected_users: affected_users,
|
79
|
+
followers: followers
|
80
|
+
)
|
81
|
+
end
|
82
|
+
end
|
83
|
+
end
|
84
|
+
end
|
@@ -0,0 +1,103 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module Amendable
|
5
|
+
# A command with all the business logic when a user starts amending a resource.
|
6
|
+
class Create < Rectify::Command
|
7
|
+
# Public: Initializes the command.
|
8
|
+
#
|
9
|
+
# form - A form object with the params.
|
10
|
+
# amendable - The resource that is being amended.
|
11
|
+
def initialize(form)
|
12
|
+
@form = form
|
13
|
+
@amendable = form.amendable
|
14
|
+
end
|
15
|
+
|
16
|
+
# Executes the command. Broadcasts these events:
|
17
|
+
#
|
18
|
+
# - :ok when everything is valid, together with the amend.
|
19
|
+
# - :invalid if the form wasn't valid and we couldn't proceed.
|
20
|
+
#
|
21
|
+
# Returns nothing.
|
22
|
+
def call
|
23
|
+
return broadcast(:invalid) if form.invalid?
|
24
|
+
return broadcast(:invalid) if emendation_doesnt_change_amendable
|
25
|
+
|
26
|
+
transaction do
|
27
|
+
create_emendation!
|
28
|
+
create_amendment!
|
29
|
+
notify_amendable_authors_and_followers
|
30
|
+
end
|
31
|
+
|
32
|
+
broadcast(:ok)
|
33
|
+
end
|
34
|
+
|
35
|
+
private
|
36
|
+
|
37
|
+
attr_reader :form
|
38
|
+
|
39
|
+
def emendation_doesnt_change_amendable
|
40
|
+
form.title == @amendable.title && form.body == @amendable.body
|
41
|
+
end
|
42
|
+
|
43
|
+
def emendation_attributes
|
44
|
+
fields = {}
|
45
|
+
|
46
|
+
parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
|
47
|
+
parsed_body = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.body, current_organization: form.current_organization).rewrite
|
48
|
+
|
49
|
+
fields[:title] = parsed_title
|
50
|
+
fields[:body] = parsed_body
|
51
|
+
fields[:component] = @amendable.component
|
52
|
+
fields[:published_at] = Time.current if form.emendation_type == "Decidim::Proposals::Proposal"
|
53
|
+
fields
|
54
|
+
end
|
55
|
+
|
56
|
+
def create_emendation!
|
57
|
+
@emendation = Decidim.traceability.perform_action!(
|
58
|
+
:create,
|
59
|
+
form.amendable_type.constantize,
|
60
|
+
form.current_user,
|
61
|
+
visibility: "public-only"
|
62
|
+
) do
|
63
|
+
emendation = form.amendable_type.constantize.new(emendation_attributes)
|
64
|
+
emendation.add_coauthor(form.current_user, user_group: form.user_group) if emendation.is_a?(Decidim::Coauthorable)
|
65
|
+
emendation.save!
|
66
|
+
emendation
|
67
|
+
end
|
68
|
+
end
|
69
|
+
|
70
|
+
def create_amendment!
|
71
|
+
@amendment = Decidim::Amendment.create!(
|
72
|
+
amender: form.current_user,
|
73
|
+
amendable: @amendable,
|
74
|
+
emendation: @emendation,
|
75
|
+
state: "evaluating"
|
76
|
+
)
|
77
|
+
end
|
78
|
+
|
79
|
+
def affected_users
|
80
|
+
@affected_users ||= begin
|
81
|
+
if @amendable.is_a?(Decidim::Coauthorable)
|
82
|
+
@amendable.authors
|
83
|
+
else
|
84
|
+
[@amendable.author]
|
85
|
+
end
|
86
|
+
end.uniq
|
87
|
+
end
|
88
|
+
|
89
|
+
def notify_amendable_authors_and_followers
|
90
|
+
Decidim::EventsManager.publish(
|
91
|
+
event: "decidim.events.amendments.amendment_created",
|
92
|
+
event_class: Decidim::Amendable::AmendmentCreatedEvent,
|
93
|
+
resource: @amendable,
|
94
|
+
affected_users: affected_users,
|
95
|
+
followers: @amendable.followers - affected_users,
|
96
|
+
extra: {
|
97
|
+
amendment_id: @amendment.id
|
98
|
+
}
|
99
|
+
)
|
100
|
+
end
|
101
|
+
end
|
102
|
+
end
|
103
|
+
end
|
@@ -0,0 +1,79 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module Amendable
|
5
|
+
# A command with all the business logic when a user promotes a rejected emendation.
|
6
|
+
class Promote < Rectify::Command
|
7
|
+
# Public: Initializes the command.
|
8
|
+
#
|
9
|
+
# emendation - The emendation to promote.
|
10
|
+
# amendable - The amendable resource.
|
11
|
+
def initialize(form)
|
12
|
+
@form = form
|
13
|
+
@emendation = form.emendation
|
14
|
+
@amendable = form.emendation.amendable
|
15
|
+
end
|
16
|
+
|
17
|
+
# Executes the command. Broadcasts these events:
|
18
|
+
#
|
19
|
+
# - :ok when everything is valid and the emendation is promoted.
|
20
|
+
# - :invalid if the transaction fails
|
21
|
+
#
|
22
|
+
# Returns nothing.
|
23
|
+
def call
|
24
|
+
return broadcast(:invalid) if @form.invalid?
|
25
|
+
|
26
|
+
transaction do
|
27
|
+
promote_emendation!
|
28
|
+
notify_amendable_and_emendation_authors_and_followers
|
29
|
+
end
|
30
|
+
|
31
|
+
broadcast(:ok, @promoted_emendation)
|
32
|
+
end
|
33
|
+
|
34
|
+
private
|
35
|
+
|
36
|
+
def promote_emendation!
|
37
|
+
@promoted_emendation = Decidim.traceability.perform_action!(
|
38
|
+
"promote",
|
39
|
+
@form.amendable_type.constantize,
|
40
|
+
@emendation.creator_author,
|
41
|
+
visibility: "public-only",
|
42
|
+
promoted_from: @emendation.id
|
43
|
+
) do
|
44
|
+
promoted_emendation = @form.amendable_type.constantize.new(emendation_attributes)
|
45
|
+
promoted_emendation.add_coauthor(@emendation.creator_author, user_group: nil) if promoted_emendation.is_a?(Decidim::Coauthorable)
|
46
|
+
promoted_emendation.save!
|
47
|
+
promoted_emendation
|
48
|
+
end
|
49
|
+
end
|
50
|
+
|
51
|
+
def emendation_attributes
|
52
|
+
fields = {}
|
53
|
+
|
54
|
+
parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, @emendation.title, current_organization: @form.current_organization).rewrite
|
55
|
+
parsed_body = Decidim::ContentProcessor.parse_with_processor(:hashtag, @emendation.body, current_organization: @form.current_organization).rewrite
|
56
|
+
|
57
|
+
fields[:title] = parsed_title
|
58
|
+
fields[:body] = parsed_body
|
59
|
+
fields[:component] = @emendation.component
|
60
|
+
fields[:published_at] = Time.current if @form.emendation_type == "Decidim::Proposals::Proposal"
|
61
|
+
|
62
|
+
fields
|
63
|
+
end
|
64
|
+
|
65
|
+
def notify_amendable_and_emendation_authors_and_followers
|
66
|
+
affected_users = @emendation.authors + @amendable.authors
|
67
|
+
followers = @emendation.followers + @amendable.followers - affected_users
|
68
|
+
|
69
|
+
Decidim::EventsManager.publish(
|
70
|
+
event: "decidim.events.amendments.amendment_promoted",
|
71
|
+
event_class: Decidim::Amendable::EmendationPromotedEvent,
|
72
|
+
resource: @emendation,
|
73
|
+
affected_users: affected_users,
|
74
|
+
followers: followers
|
75
|
+
)
|
76
|
+
end
|
77
|
+
end
|
78
|
+
end
|
79
|
+
end
|
@@ -0,0 +1,60 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module Amendable
|
5
|
+
# A command with all the business logic to reject an amend.
|
6
|
+
class Reject < Rectify::Command
|
7
|
+
# Public: Initializes the command.
|
8
|
+
#
|
9
|
+
# form - A form object with the params.
|
10
|
+
# amendable - The resource that is being amended.
|
11
|
+
def initialize(form)
|
12
|
+
@form = form
|
13
|
+
@amendment = form.amendment
|
14
|
+
@amendable = form.amendable
|
15
|
+
@emendation = form.emendation
|
16
|
+
end
|
17
|
+
|
18
|
+
# Executes the command. Broadcasts these events:
|
19
|
+
#
|
20
|
+
# - :ok when everything is valid, together with the amend.
|
21
|
+
# - :invalid if the form wasn't valid and we couldn't proceed.
|
22
|
+
#
|
23
|
+
# Returns nothing.
|
24
|
+
def call
|
25
|
+
return broadcast(:invalid) if @form.invalid?
|
26
|
+
|
27
|
+
transaction do
|
28
|
+
reject_amendment!
|
29
|
+
notify_emendation_authors_and_followers
|
30
|
+
end
|
31
|
+
|
32
|
+
broadcast(:ok, @emendation)
|
33
|
+
end
|
34
|
+
|
35
|
+
private
|
36
|
+
|
37
|
+
def reject_amendment!
|
38
|
+
@amendment = Decidim.traceability.update!(
|
39
|
+
@amendment,
|
40
|
+
@amendable.creator_author,
|
41
|
+
{ state: "rejected" },
|
42
|
+
visibility: "public-only"
|
43
|
+
)
|
44
|
+
end
|
45
|
+
|
46
|
+
def notify_emendation_authors_and_followers
|
47
|
+
affected_users = @emendation.authors + @amendable.authors
|
48
|
+
followers = @emendation.followers + @amendable.followers - affected_users
|
49
|
+
|
50
|
+
Decidim::EventsManager.publish(
|
51
|
+
event: "decidim.events.amendments.amendment_rejected",
|
52
|
+
event_class: Decidim::Amendable::AmendmentRejectedEvent,
|
53
|
+
resource: @emendation,
|
54
|
+
affected_users: affected_users,
|
55
|
+
followers: followers
|
56
|
+
)
|
57
|
+
end
|
58
|
+
end
|
59
|
+
end
|
60
|
+
end
|
@@ -0,0 +1,46 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module Amendable
|
5
|
+
# A command with all the business logic when a user starts amending a resource.
|
6
|
+
class Withdraw < Rectify::Command
|
7
|
+
# Public: Initializes the command.
|
8
|
+
#
|
9
|
+
# emendation - The resource to withdraw.
|
10
|
+
# current_user - The current user.
|
11
|
+
def initialize(emendation, current_user)
|
12
|
+
@emendation = emendation
|
13
|
+
@current_user = current_user
|
14
|
+
end
|
15
|
+
|
16
|
+
# Executes the command. Broadcasts these events:
|
17
|
+
#
|
18
|
+
# - :ok when everything is valid, together with the resource.
|
19
|
+
# - :invalid if the resource already has supports or does not belong to current user.
|
20
|
+
#
|
21
|
+
# Returns nothing.
|
22
|
+
def call
|
23
|
+
return broadcast(:invalid) if @emendation.votes.any?
|
24
|
+
|
25
|
+
transaction do
|
26
|
+
change_amendment_state_to_withdrawn
|
27
|
+
change_emendation_state_to_withdrawn
|
28
|
+
end
|
29
|
+
|
30
|
+
broadcast(:ok, @emendation)
|
31
|
+
end
|
32
|
+
|
33
|
+
private
|
34
|
+
|
35
|
+
def change_amendment_state_to_withdrawn
|
36
|
+
@emendation.amendment.update state: "withdrawn"
|
37
|
+
end
|
38
|
+
|
39
|
+
def change_emendation_state_to_withdrawn
|
40
|
+
# rubocop:disable Rails/SkipsModelValidations
|
41
|
+
@emendation.update_attribute :state, "withdrawn"
|
42
|
+
# rubocop:enable Rails/SkipsModelValidations
|
43
|
+
end
|
44
|
+
end
|
45
|
+
end
|
46
|
+
end
|
@@ -26,8 +26,9 @@ module Decidim
|
|
26
26
|
|
27
27
|
transaction do
|
28
28
|
create_or_find_user
|
29
|
-
create_identity
|
29
|
+
@identity = create_identity
|
30
30
|
end
|
31
|
+
trigger_omniauth_registration
|
31
32
|
|
32
33
|
broadcast(:ok, @user)
|
33
34
|
rescue ActiveRecord::RecordInvalid => error
|
@@ -91,6 +92,21 @@ module Decidim
|
|
91
92
|
signature = OmniauthRegistrationForm.create_signature(form.provider, form.uid)
|
92
93
|
form.oauth_signature == signature
|
93
94
|
end
|
95
|
+
|
96
|
+
def trigger_omniauth_registration
|
97
|
+
ActiveSupport::Notifications.publish(
|
98
|
+
"decidim.events.user.omniauth_registration",
|
99
|
+
user_id: @user.id,
|
100
|
+
identity_id: @identity.id,
|
101
|
+
provider: form.provider,
|
102
|
+
uid: form.uid,
|
103
|
+
email: form.email,
|
104
|
+
name: form.name,
|
105
|
+
nickname: form.normalized_nickname,
|
106
|
+
avatar_url: form.avatar_url,
|
107
|
+
raw_data: form.raw_data
|
108
|
+
)
|
109
|
+
end
|
94
110
|
end
|
95
111
|
|
96
112
|
class InvalidOauthSignature < StandardError
|