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
@@ -4,6 +4,9 @@ module Decidim
|
|
4
4
|
# The controller to handle user groups join requests.
|
5
5
|
class UserGroupJoinRequestsController < Decidim::ApplicationController
|
6
6
|
include FormFactory
|
7
|
+
include UserGroups
|
8
|
+
|
9
|
+
before_action :enforce_user_groups_enabled
|
7
10
|
|
8
11
|
def create
|
9
12
|
enforce_permission_to :join, :user_group
|
@@ -0,0 +1,32 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
# The controller to handle the user's interests page.
|
5
|
+
class UserInterestsController < Decidim::ApplicationController
|
6
|
+
include Decidim::UserProfile
|
7
|
+
|
8
|
+
helper_method :scopes
|
9
|
+
|
10
|
+
def show
|
11
|
+
enforce_permission_to :read, :user, current_user: current_user
|
12
|
+
@user_interests = form(UserInterestsForm).from_model(current_user)
|
13
|
+
end
|
14
|
+
|
15
|
+
def update
|
16
|
+
enforce_permission_to :update, :user, current_user: current_user
|
17
|
+
@user_interests = form(UserInterestsForm).from_params(params)
|
18
|
+
|
19
|
+
UpdateUserInterests.call(current_user, @user_interests) do
|
20
|
+
on(:ok) do
|
21
|
+
flash.keep[:notice] = t("user_interests.update.success", scope: "decidim")
|
22
|
+
end
|
23
|
+
|
24
|
+
on(:invalid) do
|
25
|
+
flash.keep[:alert] = t("user_interests.update.error", scope: "decidim")
|
26
|
+
end
|
27
|
+
end
|
28
|
+
|
29
|
+
redirect_to action: :show
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
@@ -0,0 +1,40 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
# The controller to show all the last activities in a Decidim Organization.
|
5
|
+
class UserTimelineController < Decidim::ApplicationController
|
6
|
+
include Paginable
|
7
|
+
include UserGroups
|
8
|
+
|
9
|
+
helper Decidim::ResourceHelper
|
10
|
+
helper_method :activities, :user
|
11
|
+
|
12
|
+
def index
|
13
|
+
raise ActionController::RoutingError, "Not Found" if current_user != user
|
14
|
+
end
|
15
|
+
|
16
|
+
private
|
17
|
+
|
18
|
+
def user
|
19
|
+
@user ||= Decidim::User.find_by(
|
20
|
+
organization: current_organization,
|
21
|
+
nickname: params[:nickname]
|
22
|
+
)
|
23
|
+
end
|
24
|
+
|
25
|
+
def activities
|
26
|
+
@activities ||= paginate(
|
27
|
+
ActivitySearch.new(
|
28
|
+
organization: current_organization,
|
29
|
+
resource_type: "all",
|
30
|
+
scopes: current_user.interested_scopes,
|
31
|
+
follows: follows
|
32
|
+
).run
|
33
|
+
)
|
34
|
+
end
|
35
|
+
|
36
|
+
def follows
|
37
|
+
@follows ||= Decidim::Follow.where(user: user)
|
38
|
+
end
|
39
|
+
end
|
40
|
+
end
|
@@ -0,0 +1,23 @@
|
|
1
|
+
# frozen-string_literal: true
|
2
|
+
|
3
|
+
module Decidim::Amendable
|
4
|
+
class AmendmentAcceptedEvent < Decidim::Amendable::AmendmentBaseEvent
|
5
|
+
i18n_attributes :amendable_path, :amendable_type, :amendable_title, :emendation_path, :emendation_author_nickname, :emendation_author_path
|
6
|
+
|
7
|
+
def amendment_resource
|
8
|
+
@amendment_resource ||= resource.amendment
|
9
|
+
end
|
10
|
+
|
11
|
+
def amendable_resource
|
12
|
+
@amendable_resource ||= resource.amendable
|
13
|
+
end
|
14
|
+
|
15
|
+
def emendation_resource
|
16
|
+
resource
|
17
|
+
end
|
18
|
+
|
19
|
+
def event_has_roles?
|
20
|
+
true
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
@@ -0,0 +1,39 @@
|
|
1
|
+
# frozen-string_literal: true
|
2
|
+
|
3
|
+
module Decidim::Amendable
|
4
|
+
class AmendmentBaseEvent < Decidim::Events::SimpleEvent
|
5
|
+
i18n_attributes :amendable_path, :amendable_type, :amendable_title, :emendation_path, :emendation_author_nickname, :emendation_author_path
|
6
|
+
|
7
|
+
def amendable_title
|
8
|
+
@amendable_title ||= amendable_resource.title
|
9
|
+
end
|
10
|
+
|
11
|
+
def amendable_type
|
12
|
+
@amendable_type ||= I18n.t(amendable_resource.class.model_name.i18n_key, scope: "activerecord.models", count: 1).downcase
|
13
|
+
end
|
14
|
+
|
15
|
+
def amendable_path
|
16
|
+
@amendable_path ||= Decidim::ResourceLocatorPresenter.new(amendable_resource).path
|
17
|
+
end
|
18
|
+
|
19
|
+
def emendation_author
|
20
|
+
@emendation_author ||= if emendation_resource.is_a?(Decidim::Coauthorable)
|
21
|
+
Decidim::UserPresenter.new(emendation_resource.creator_author)
|
22
|
+
else
|
23
|
+
Decidim::UserPresenter.new(emendation_resource.author)
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
27
|
+
def emendation_author_nickname
|
28
|
+
@emendation_author_nickname ||= emendation_author.nickname
|
29
|
+
end
|
30
|
+
|
31
|
+
def emendation_author_path
|
32
|
+
@emendation_author_path ||= emendation_author.profile_path
|
33
|
+
end
|
34
|
+
|
35
|
+
def emendation_path
|
36
|
+
@emendation_path ||= Decidim::ResourceLocatorPresenter.new(emendation_resource).path
|
37
|
+
end
|
38
|
+
end
|
39
|
+
end
|
@@ -0,0 +1,23 @@
|
|
1
|
+
# frozen-string_literal: true
|
2
|
+
|
3
|
+
module Decidim::Amendable
|
4
|
+
class AmendmentCreatedEvent < Decidim::Amendable::AmendmentBaseEvent
|
5
|
+
i18n_attributes :amendable_path, :amendable_type, :amendable_title, :emendation_path, :emendation_author_nickname, :emendation_author_path
|
6
|
+
|
7
|
+
def amendment_resource
|
8
|
+
@amendment_resource ||= Decidim::Amendment.find extra[:amendment_id]
|
9
|
+
end
|
10
|
+
|
11
|
+
def amendable_resource
|
12
|
+
resource
|
13
|
+
end
|
14
|
+
|
15
|
+
def emendation_resource
|
16
|
+
@emendation_resource ||= amendment_resource.emendation
|
17
|
+
end
|
18
|
+
|
19
|
+
def event_has_roles?
|
20
|
+
true
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
@@ -0,0 +1,23 @@
|
|
1
|
+
# frozen-string_literal: true
|
2
|
+
|
3
|
+
module Decidim::Amendable
|
4
|
+
class AmendmentRejectedEvent < Decidim::Amendable::AmendmentBaseEvent
|
5
|
+
i18n_attributes :amendable_path, :amendable_type, :amendable_title, :emendation_path, :emendation_author_nickname, :emendation_author_path
|
6
|
+
|
7
|
+
def amendment_resource
|
8
|
+
@amendment_resource ||= resource.amendment
|
9
|
+
end
|
10
|
+
|
11
|
+
def amendable_resource
|
12
|
+
@amendable_resource ||= resource.amendable
|
13
|
+
end
|
14
|
+
|
15
|
+
def emendation_resource
|
16
|
+
resource
|
17
|
+
end
|
18
|
+
|
19
|
+
def event_has_roles?
|
20
|
+
true
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
@@ -0,0 +1,23 @@
|
|
1
|
+
# frozen-string_literal: true
|
2
|
+
|
3
|
+
module Decidim::Amendable
|
4
|
+
class EmendationPromotedEvent < Decidim::Amendable::AmendmentBaseEvent
|
5
|
+
i18n_attributes :amendable_path, :amendable_type, :amendable_title, :emendation_path, :emendation_author_nickname, :emendation_author_path
|
6
|
+
|
7
|
+
def amendment_resource
|
8
|
+
@amendment_resource ||= resource.amendment
|
9
|
+
end
|
10
|
+
|
11
|
+
def amendable_resource
|
12
|
+
@amendable_resource ||= resource.amendable
|
13
|
+
end
|
14
|
+
|
15
|
+
def emendation_resource
|
16
|
+
resource
|
17
|
+
end
|
18
|
+
|
19
|
+
def event_has_roles?
|
20
|
+
true
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
@@ -0,0 +1,58 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "mustache"
|
4
|
+
|
5
|
+
module Decidim
|
6
|
+
class WelcomeNotificationEvent < Decidim::Events::BaseEvent
|
7
|
+
include Decidim::Events::EmailEvent
|
8
|
+
include Decidim::Events::NotificationEvent
|
9
|
+
include TranslationsHelper
|
10
|
+
|
11
|
+
delegate :organization, to: :user, prefix: false
|
12
|
+
delegate :url_helpers, to: "Decidim::Core::Engine.routes"
|
13
|
+
|
14
|
+
def subject
|
15
|
+
interpolate(organization.welcome_notification_subject.symbolize_keys[I18n.locale])
|
16
|
+
end
|
17
|
+
|
18
|
+
def body
|
19
|
+
interpolate(organization.welcome_notification_body.symbolize_keys[I18n.locale])
|
20
|
+
end
|
21
|
+
|
22
|
+
def email_subject
|
23
|
+
subject
|
24
|
+
end
|
25
|
+
|
26
|
+
def email_greeting; end
|
27
|
+
|
28
|
+
def email_intro
|
29
|
+
body
|
30
|
+
end
|
31
|
+
|
32
|
+
def email_outro; end
|
33
|
+
|
34
|
+
def notification_title
|
35
|
+
("<p><strong>#{subject}</strong></p>" + body).html_safe
|
36
|
+
end
|
37
|
+
|
38
|
+
def resource_path
|
39
|
+
nil
|
40
|
+
end
|
41
|
+
|
42
|
+
def resource_title
|
43
|
+
nil
|
44
|
+
end
|
45
|
+
|
46
|
+
private
|
47
|
+
|
48
|
+
def interpolate(template)
|
49
|
+
Mustache.render(
|
50
|
+
template.to_s,
|
51
|
+
organization: organization.name,
|
52
|
+
name: user.name,
|
53
|
+
help_url: url_helpers.pages_url(host: organization.host),
|
54
|
+
badges_url: url_helpers.gamification_badges_url(host: organization.host)
|
55
|
+
).html_safe
|
56
|
+
end
|
57
|
+
end
|
58
|
+
end
|
@@ -0,0 +1,54 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module Amendable
|
5
|
+
# A form object to be used when users want to amend an amendable resource.
|
6
|
+
class CreateForm < Decidim::Amendable::Form
|
7
|
+
mimic :amend
|
8
|
+
|
9
|
+
attribute :amendable_gid, String
|
10
|
+
attribute :user_group_id, Integer
|
11
|
+
attribute :emendation_fields, Object
|
12
|
+
attribute :title, String
|
13
|
+
attribute :body, String
|
14
|
+
|
15
|
+
validates :amendable_gid, presence: true
|
16
|
+
validates :title, :body, presence: true, etiquette: true
|
17
|
+
validates :title, length: { maximum: 150 }
|
18
|
+
|
19
|
+
def title
|
20
|
+
@title ||= emendation_fields[:title]
|
21
|
+
end
|
22
|
+
|
23
|
+
def body
|
24
|
+
@body ||= emendation_fields[:body]
|
25
|
+
end
|
26
|
+
|
27
|
+
def amendable
|
28
|
+
@amendable ||= GlobalID::Locator.locate_signed amendable_gid
|
29
|
+
end
|
30
|
+
|
31
|
+
def amendable_type
|
32
|
+
amendable.resource_manifest.model_class_name
|
33
|
+
end
|
34
|
+
|
35
|
+
def emendation_type
|
36
|
+
amendable_type
|
37
|
+
end
|
38
|
+
|
39
|
+
def amender
|
40
|
+
current_user
|
41
|
+
end
|
42
|
+
|
43
|
+
def user_group
|
44
|
+
return unless current_organization.user_groups_enabled? && user_group_id
|
45
|
+
|
46
|
+
@user_group ||= Decidim::UserGroup.find_by(id: user_group_id, organization: current_organization)
|
47
|
+
end
|
48
|
+
|
49
|
+
def emendation_fields
|
50
|
+
@emendation_fields ||= amendable.form.from_model(amendable)
|
51
|
+
end
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
@@ -0,0 +1,22 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module Amendable
|
5
|
+
# a form object common for amendments
|
6
|
+
class Form < Decidim::Form
|
7
|
+
mimic :amend
|
8
|
+
|
9
|
+
def amendment
|
10
|
+
@amendment ||= Decidim::Amendment.find id
|
11
|
+
end
|
12
|
+
|
13
|
+
def amendable
|
14
|
+
@amendable ||= amendment.amendable
|
15
|
+
end
|
16
|
+
|
17
|
+
def emendation
|
18
|
+
@emendation ||= amendment.emendation
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
@@ -0,0 +1,26 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module Amendable
|
5
|
+
# A form object used to promote emendations
|
6
|
+
class PromoteForm < Decidim::Amendable::Form
|
7
|
+
mimic :amend
|
8
|
+
|
9
|
+
attribute :id, String
|
10
|
+
|
11
|
+
validates :id, presence: true
|
12
|
+
|
13
|
+
def emendation
|
14
|
+
@emendation ||= Amendment.find_by(decidim_emendation_id: id).emendation
|
15
|
+
end
|
16
|
+
|
17
|
+
def amendable_type
|
18
|
+
emendation_type
|
19
|
+
end
|
20
|
+
|
21
|
+
def emendation_type
|
22
|
+
emendation.resource_manifest.model_class_name
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
@@ -0,0 +1,14 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module Amendable
|
5
|
+
# A form object used to reject emendations
|
6
|
+
class RejectForm < Decidim::Amendable::Form
|
7
|
+
mimic :reject_amend
|
8
|
+
|
9
|
+
attribute :id, String
|
10
|
+
|
11
|
+
validates :id, presence: true
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
@@ -0,0 +1,35 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module Amendable
|
5
|
+
# A form object used to review emendations
|
6
|
+
class ReviewForm < Decidim::Amendable::Form
|
7
|
+
mimic :amend
|
8
|
+
|
9
|
+
attribute :id, String
|
10
|
+
attribute :title, String
|
11
|
+
attribute :body, String
|
12
|
+
attribute :emendation_fields, Object
|
13
|
+
|
14
|
+
validates :id, presence: true
|
15
|
+
validates :title, :body, presence: true, etiquette: true
|
16
|
+
validates :title, length: { maximum: 150 }
|
17
|
+
|
18
|
+
def title
|
19
|
+
@title ||= emendation_fields[:title]
|
20
|
+
end
|
21
|
+
|
22
|
+
def body
|
23
|
+
@body ||= emendation_fields[:body]
|
24
|
+
end
|
25
|
+
|
26
|
+
def emendation_type
|
27
|
+
emendation.resource_manifest.model_class_name
|
28
|
+
end
|
29
|
+
|
30
|
+
def emendation_fields
|
31
|
+
@emendation_fields ||= emendation.form.from_model(emendation)
|
32
|
+
end
|
33
|
+
end
|
34
|
+
end
|
35
|
+
end
|
@@ -6,19 +6,32 @@ module Decidim
|
|
6
6
|
class NotificationsSettingsForm < Form
|
7
7
|
mimic :user
|
8
8
|
|
9
|
-
attribute :email_on_notification
|
10
|
-
attribute :newsletter_notifications
|
9
|
+
attribute :email_on_notification, Boolean
|
10
|
+
attribute :newsletter_notifications, Boolean
|
11
|
+
attribute :notifications_from_followed, Boolean
|
12
|
+
attribute :notifications_from_own_activity, Boolean
|
11
13
|
|
12
|
-
|
13
|
-
|
14
|
+
def map_model(user)
|
15
|
+
self.newsletter_notifications = user.newsletter_notifications_at.present?
|
16
|
+
self.notifications_from_followed = ["all", "followed-only"].include? user.notification_types
|
17
|
+
self.notifications_from_own_activity = ["all", "own-only"].include? user.notification_types
|
18
|
+
end
|
14
19
|
|
15
20
|
def newsletter_notifications_at
|
16
21
|
return nil unless newsletter_notifications
|
17
22
|
Time.current
|
18
23
|
end
|
19
24
|
|
20
|
-
def
|
21
|
-
|
25
|
+
def notification_types
|
26
|
+
if notifications_from_followed && notifications_from_own_activity
|
27
|
+
"all"
|
28
|
+
elsif notifications_from_followed
|
29
|
+
"followed-only"
|
30
|
+
elsif notifications_from_own_activity
|
31
|
+
"own-only"
|
32
|
+
else
|
33
|
+
"none"
|
34
|
+
end
|
22
35
|
end
|
23
36
|
end
|
24
37
|
end
|