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,43 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
shared_examples "amendment rejected event" do
|
4
|
+
include_context "when a simple event"
|
5
|
+
|
6
|
+
let(:resource) { emendation }
|
7
|
+
let(:event_name) { "decidim.events.amendments.amendment_rejected" }
|
8
|
+
|
9
|
+
it_behaves_like "a simple event"
|
10
|
+
|
11
|
+
let(:amendable_title) { amendable.title }
|
12
|
+
let(:emendation_author_nickname) { "@#{emendation.creator_author.nickname}" }
|
13
|
+
let(:emendation_path) { Decidim::ResourceLocatorPresenter.new(emendation).path }
|
14
|
+
let(:emendation_author_path) { Decidim::UserPresenter.new(emendation.creator_author).profile_path }
|
15
|
+
let(:amendable_path) { Decidim::ResourceLocatorPresenter.new(amendable).path }
|
16
|
+
|
17
|
+
describe "email_subject" do
|
18
|
+
it "is generated correctly" do
|
19
|
+
expect(subject.email_subject).to eq("An amendment rejected for #{amendable_title} from #{emendation_author_nickname}")
|
20
|
+
end
|
21
|
+
end
|
22
|
+
|
23
|
+
describe "email_intro" do
|
24
|
+
it "is generated correctly" do
|
25
|
+
expect(subject.email_intro)
|
26
|
+
.to eq("An emendation has been rejected for #{amendable_title}. You can see it from this page:")
|
27
|
+
end
|
28
|
+
end
|
29
|
+
|
30
|
+
describe "email_outro" do
|
31
|
+
it "is generated correctly" do
|
32
|
+
expect(subject.email_outro)
|
33
|
+
.to eq("You have received this notification because you are following #{amendable_title}. You can stop receiving notifications following the previous link.")
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
describe "notification_title" do
|
38
|
+
it "is generated correctly" do
|
39
|
+
expect(subject.notification_title)
|
40
|
+
.to include("The <a href=\"#{emendation_path}\">emendation</a> created by <a href=\"#{emendation_author_path}\">#{emendation_author_nickname}</a> has been rejected for <a href=\"#{amendable_path}\">#{amendable_title}</a> #{amendable_type}.") # rubocop:disable Metrics/LineLength
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
@@ -0,0 +1,78 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
shared_examples "create amendment" do
|
4
|
+
context "when the form is valid" do
|
5
|
+
it "broadcasts ok" do
|
6
|
+
expect { command.call }.to broadcast(:ok)
|
7
|
+
end
|
8
|
+
|
9
|
+
it "creates an amendment and the emendation" do
|
10
|
+
expect { command.call }
|
11
|
+
.to change(Decidim::Amendment, :count)
|
12
|
+
.by(1)
|
13
|
+
.and change(amendable.resource_manifest.model_class_name.constantize, :count)
|
14
|
+
.by(1)
|
15
|
+
end
|
16
|
+
|
17
|
+
it "traces the action", versioning: true do
|
18
|
+
expect(Decidim.traceability)
|
19
|
+
.to receive(:perform_action!)
|
20
|
+
.with(
|
21
|
+
:create,
|
22
|
+
form.amendable_type.constantize,
|
23
|
+
form.current_user,
|
24
|
+
kind_of(Hash)
|
25
|
+
).and_call_original
|
26
|
+
|
27
|
+
expect { command.call }.to change(Decidim::ActionLog, :count).by(1)
|
28
|
+
end
|
29
|
+
|
30
|
+
it "notifies the change" do
|
31
|
+
expect(Decidim::EventsManager)
|
32
|
+
.to receive(:publish)
|
33
|
+
.with(
|
34
|
+
event: "decidim.events.amendments.amendment_created",
|
35
|
+
event_class: Decidim::Amendable::AmendmentCreatedEvent,
|
36
|
+
resource: amendable,
|
37
|
+
followers: kind_of(Array),
|
38
|
+
affected_users: kind_of(Array),
|
39
|
+
extra: kind_of(Hash)
|
40
|
+
)
|
41
|
+
|
42
|
+
command.call
|
43
|
+
end
|
44
|
+
end
|
45
|
+
|
46
|
+
context "when the form is invalid" do
|
47
|
+
let(:title) { "Too short" }
|
48
|
+
|
49
|
+
it "broadcasts invalid" do
|
50
|
+
expect { command.call }.to broadcast(:invalid)
|
51
|
+
end
|
52
|
+
|
53
|
+
it "doesn't create an amendment and the emendation" do
|
54
|
+
expect { command.call }
|
55
|
+
.to change(Decidim::Amendment, :count)
|
56
|
+
.by(0)
|
57
|
+
.and change(amendable.resource_manifest.model_class_name.constantize, :count)
|
58
|
+
.by(0)
|
59
|
+
end
|
60
|
+
end
|
61
|
+
|
62
|
+
context "when the emendation doens't change the amendable" do
|
63
|
+
let(:title) { amendable.title }
|
64
|
+
let(:body) { amendable.body }
|
65
|
+
|
66
|
+
it "broadcasts invalid" do
|
67
|
+
expect { command.call }.to broadcast(:invalid)
|
68
|
+
end
|
69
|
+
|
70
|
+
it "doesn't create an amendment and the emendation" do
|
71
|
+
expect { command.call }
|
72
|
+
.to change(Decidim::Amendment, :count)
|
73
|
+
.by(0)
|
74
|
+
.and change(amendable.resource_manifest.model_class_name.constantize, :count)
|
75
|
+
.by(0)
|
76
|
+
end
|
77
|
+
end
|
78
|
+
end
|
@@ -0,0 +1,43 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
shared_examples "promote amendment" do
|
4
|
+
describe "when the form is valid" do
|
5
|
+
it "broadcasts ok" do
|
6
|
+
expect { command.call }.to broadcast(:ok)
|
7
|
+
end
|
8
|
+
|
9
|
+
it "creates an amendable type resource" do
|
10
|
+
expect { command.call }
|
11
|
+
.to change(amendable.resource_manifest.model_class_name.constantize, :count)
|
12
|
+
.by(1)
|
13
|
+
end
|
14
|
+
|
15
|
+
it "traces the action", versioning: true do
|
16
|
+
expect(Decidim.traceability)
|
17
|
+
.to receive(:perform_action!)
|
18
|
+
.with(
|
19
|
+
"promote",
|
20
|
+
emendation.resource_manifest.model_class_name.constantize,
|
21
|
+
emendation.creator_author,
|
22
|
+
visibility: "public-only",
|
23
|
+
promoted_from: emendation.id
|
24
|
+
).and_call_original
|
25
|
+
|
26
|
+
expect { command.call }.to change(Decidim::ActionLog, :count).by(1)
|
27
|
+
end
|
28
|
+
|
29
|
+
it "notifies the change" do
|
30
|
+
expect(Decidim::EventsManager)
|
31
|
+
.to receive(:publish)
|
32
|
+
.with(
|
33
|
+
event: "decidim.events.amendments.amendment_promoted",
|
34
|
+
event_class: Decidim::Amendable::EmendationPromotedEvent,
|
35
|
+
resource: emendation,
|
36
|
+
affected_users: kind_of(Array),
|
37
|
+
followers: kind_of(Array)
|
38
|
+
)
|
39
|
+
|
40
|
+
command.call
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
@@ -0,0 +1,41 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
shared_examples "reject amendment" do
|
4
|
+
describe "when the form is valid" do
|
5
|
+
it "broadcasts ok" do
|
6
|
+
expect { command.call }.to broadcast(:ok)
|
7
|
+
end
|
8
|
+
|
9
|
+
it "changes the emendation state to rejected" do
|
10
|
+
expect { command.call }.to change(emendation, :state)
|
11
|
+
.from("evaluating").to("rejected")
|
12
|
+
end
|
13
|
+
|
14
|
+
it "traces the action", versioning: true do
|
15
|
+
expect(Decidim.traceability)
|
16
|
+
.to receive(:update!)
|
17
|
+
.with(
|
18
|
+
amendment,
|
19
|
+
amendable.creator_author,
|
20
|
+
{ state: "rejected" },
|
21
|
+
visibility: "public-only"
|
22
|
+
).and_call_original
|
23
|
+
|
24
|
+
expect { command.call }.to change(Decidim::ActionLog, :count).by(1)
|
25
|
+
end
|
26
|
+
|
27
|
+
it "notifies the change" do
|
28
|
+
expect(Decidim::EventsManager)
|
29
|
+
.to receive(:publish)
|
30
|
+
.with(
|
31
|
+
event: "decidim.events.amendments.amendment_rejected",
|
32
|
+
event_class: Decidim::Amendable::AmendmentRejectedEvent,
|
33
|
+
resource: emendation,
|
34
|
+
affected_users: kind_of(Array),
|
35
|
+
followers: kind_of(Array)
|
36
|
+
)
|
37
|
+
|
38
|
+
command.call
|
39
|
+
end
|
40
|
+
end
|
41
|
+
end
|
@@ -0,0 +1,29 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
shared_examples "withdraw amendment" do
|
4
|
+
context "when current user IS the author of the amendment" do
|
5
|
+
context "and the amendment has no supports" do
|
6
|
+
it "withdraws the amendment" do
|
7
|
+
expect do
|
8
|
+
expect { command.call }.to broadcast(:ok)
|
9
|
+
end.to change { Decidim::Proposals::Proposal.count }.by(0)
|
10
|
+
expect(emendation.amendment.state).to eq("withdrawn")
|
11
|
+
expect(emendation.state).to eq("withdrawn")
|
12
|
+
end
|
13
|
+
end
|
14
|
+
|
15
|
+
context "and the amendment HAS some supports" do
|
16
|
+
before do
|
17
|
+
emendation.votes.create!(author: current_user)
|
18
|
+
end
|
19
|
+
|
20
|
+
it "is not able to withdraw the amendment" do
|
21
|
+
expect do
|
22
|
+
expect { command.call }.to broadcast(:invalid)
|
23
|
+
end.to change { Decidim::Proposals::Proposal.count }.by(0)
|
24
|
+
expect(emendation.amendment.state).not_to eq("withdrawn")
|
25
|
+
expect(emendation.state).not_to eq("withdrawn")
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
@@ -0,0 +1,30 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
shared_examples "shows contextual help" do
|
4
|
+
before do
|
5
|
+
Decidim::ContextualHelpSection.set_content(
|
6
|
+
organization,
|
7
|
+
manifest_name,
|
8
|
+
en: "<p>Some relevant help</p>"
|
9
|
+
)
|
10
|
+
end
|
11
|
+
|
12
|
+
it "shows the contextual help on the root path on first visit, hides it on subsequent ones" do
|
13
|
+
visit index_path
|
14
|
+
|
15
|
+
within ".floating-helper-container" do
|
16
|
+
expect(page).to have_content("Some relevant help")
|
17
|
+
find(".floating-helper__content-close").click
|
18
|
+
end
|
19
|
+
|
20
|
+
visit current_path
|
21
|
+
|
22
|
+
expect(page).to have_no_content("Some relevant help")
|
23
|
+
|
24
|
+
find(".floating-helper__text").click
|
25
|
+
|
26
|
+
within ".floating-helper__content" do
|
27
|
+
expect(page).to have_css("p", text: "Some relevant help")
|
28
|
+
end
|
29
|
+
end
|
30
|
+
end
|
@@ -0,0 +1,17 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "spec_helper"
|
4
|
+
|
5
|
+
shared_examples_for "resourceable" do
|
6
|
+
describe "resource_title" do
|
7
|
+
it "is defined" do
|
8
|
+
expect(subject.resource_title).to be_present
|
9
|
+
end
|
10
|
+
end
|
11
|
+
|
12
|
+
describe "resource_description" do
|
13
|
+
it "is defined" do
|
14
|
+
expect(subject.resource_title).to be_present
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
@@ -21,7 +21,7 @@ shared_examples "searchable results" do
|
|
21
21
|
expect(page).to have_current_path decidim.search_path, ignore_query: true
|
22
22
|
expect(page).to have_content(/results for the search: "#{term}"/i)
|
23
23
|
expect(page).to have_selector(".filters__section")
|
24
|
-
expect(page.find("#
|
24
|
+
expect(page.find("#search-count .section-heading").text.to_i).to be_positive
|
25
25
|
end
|
26
26
|
end
|
27
27
|
end
|
@@ -3,11 +3,14 @@
|
|
3
3
|
require "spec_helper"
|
4
4
|
|
5
5
|
shared_context "when a simple event" do
|
6
|
-
subject
|
6
|
+
subject { event_instance }
|
7
|
+
|
8
|
+
let(:event_instance) do
|
7
9
|
described_class.new(
|
8
10
|
resource: resource,
|
9
11
|
event_name: event_name,
|
10
12
|
user: user,
|
13
|
+
user_role: user_role,
|
11
14
|
extra: extra
|
12
15
|
)
|
13
16
|
end
|
@@ -20,6 +23,7 @@ shared_context "when a simple event" do
|
|
20
23
|
end
|
21
24
|
end
|
22
25
|
let(:user) { create :user, organization: organization }
|
26
|
+
let(:user_role) { :follower }
|
23
27
|
let(:extra) { {} }
|
24
28
|
let(:resource_path) { resource_locator(resource).path }
|
25
29
|
let(:resource_url) { resource_locator(resource).url }
|
@@ -55,30 +59,35 @@ shared_examples_for "a simple event" do |skip_space_checks|
|
|
55
59
|
describe "email_subject" do
|
56
60
|
it "is generated correctly" do
|
57
61
|
expect(subject.email_subject).to be_kind_of(String)
|
62
|
+
expect(subject.email_subject).not_to include("translation missing")
|
58
63
|
end
|
59
64
|
end
|
60
65
|
|
61
66
|
describe "email_intro" do
|
62
67
|
it "is generated correctly" do
|
63
68
|
expect(subject.email_intro).to be_kind_of(String)
|
69
|
+
expect(subject.email_intro).not_to include("translation missing")
|
64
70
|
end
|
65
71
|
end
|
66
72
|
|
67
73
|
describe "email_outro" do
|
68
74
|
it "is generated correctly" do
|
69
75
|
expect(subject.email_outro).to be_kind_of(String)
|
76
|
+
expect(subject.email_outro).not_to include("translation missing")
|
70
77
|
end
|
71
78
|
end
|
72
79
|
|
73
80
|
describe "email_greeting" do
|
74
81
|
it "is generated correctly" do
|
75
82
|
expect(subject.email_greeting).to be_kind_of(String)
|
83
|
+
expect(subject.email_greeting).not_to include("translation missing")
|
76
84
|
end
|
77
85
|
end
|
78
86
|
|
79
87
|
describe "notification_title" do
|
80
88
|
it "is generated correctly" do
|
81
89
|
expect(subject.notification_title).to be_kind_of(String)
|
90
|
+
expect(subject.notification_title).not_to include("translation missing")
|
82
91
|
end
|
83
92
|
end
|
84
93
|
|
@@ -95,6 +104,12 @@ shared_examples_for "a simple event" do |skip_space_checks|
|
|
95
104
|
end
|
96
105
|
end
|
97
106
|
|
107
|
+
describe "resource_title" do
|
108
|
+
it "responds to the method" do
|
109
|
+
expect(subject).to respond_to(:resource_title)
|
110
|
+
end
|
111
|
+
end
|
112
|
+
|
98
113
|
unless skip_space_checks
|
99
114
|
describe "participatory_space_url" do
|
100
115
|
it "is generated correctly" do
|
@@ -110,7 +125,14 @@ shared_examples_for "a simple event" do |skip_space_checks|
|
|
110
125
|
it { is_expected.to include(resource_path: satisfy(&:present?)) }
|
111
126
|
it { is_expected.to include(resource_title: satisfy(&:present?)) }
|
112
127
|
it { is_expected.to include(resource_url: start_with("http")) }
|
113
|
-
|
128
|
+
|
129
|
+
it "includes the i18n scope" do
|
130
|
+
if event_instance.event_has_roles?
|
131
|
+
expect(subject).to include(scope: "#{i18n_scope}.#{user_role}")
|
132
|
+
else
|
133
|
+
expect(subject).to include(scope: i18n_scope)
|
134
|
+
end
|
135
|
+
end
|
114
136
|
|
115
137
|
unless skip_space_checks
|
116
138
|
it { is_expected.to include(participatory_space_title: satisfy(&:present?)) }
|
data/lib/decidim/core/version.rb
CHANGED
@@ -40,11 +40,14 @@ module Decidim
|
|
40
40
|
# event_name - a String with the name of the event.
|
41
41
|
# resource - the resource that received the event
|
42
42
|
# user - the User that receives the event
|
43
|
+
# user_role - the role the user takes for this event (either `:follower` or
|
44
|
+
# `:affected_user`)
|
43
45
|
# extra - a Hash with extra information of the event.
|
44
|
-
def initialize(resource:, event_name:, user:, extra:)
|
46
|
+
def initialize(resource:, event_name:, user:, user_role: nil, extra: {})
|
45
47
|
@event_name = event_name
|
46
48
|
@resource = resource
|
47
49
|
@user = user
|
50
|
+
@user_role = user_role
|
48
51
|
@extra = extra.with_indifferent_access
|
49
52
|
end
|
50
53
|
|
@@ -80,9 +83,21 @@ module Decidim
|
|
80
83
|
true
|
81
84
|
end
|
82
85
|
|
86
|
+
def resource_text; end
|
87
|
+
|
88
|
+
def resource_title
|
89
|
+
return unless resource
|
90
|
+
|
91
|
+
if resource.respond_to?(:title)
|
92
|
+
translated_attribute(resource.title)
|
93
|
+
elsif resource.respond_to?(:name)
|
94
|
+
translated_attribute(resource.name)
|
95
|
+
end
|
96
|
+
end
|
97
|
+
|
83
98
|
private
|
84
99
|
|
85
|
-
attr_reader :event_name, :resource, :user, :extra
|
100
|
+
attr_reader :event_name, :resource, :user, :user_role, :extra
|
86
101
|
|
87
102
|
def component
|
88
103
|
return resource.component if resource.is_a?(Decidim::HasComponent)
|
@@ -93,16 +108,6 @@ module Decidim
|
|
93
108
|
return resource if resource.is_a?(Decidim::ParticipatorySpaceResourceable)
|
94
109
|
component&.participatory_space
|
95
110
|
end
|
96
|
-
|
97
|
-
def resource_title
|
98
|
-
return unless resource
|
99
|
-
|
100
|
-
if resource.respond_to?(:title)
|
101
|
-
translated_attribute(resource.title)
|
102
|
-
elsif resource.respond_to?(:name)
|
103
|
-
translated_attribute(resource.name)
|
104
|
-
end
|
105
|
-
end
|
106
111
|
end
|
107
112
|
end
|
108
113
|
end
|