decidim-core 0.14.4 → 0.15.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 +20 -0
- data/app/assets/images/decidim/cc-badge.png +0 -0
- data/app/assets/images/decidim/gamification/badges/continuity.svg +73 -0
- data/app/assets/images/decidim/gamification/badges/followers.svg +115 -0
- data/app/assets/images/decidim/icons.svg +1 -0
- data/app/assets/javascripts/decidim/vizzs/areachart.js.es6 +186 -208
- data/app/assets/javascripts/decidim/vizzs/linechart.js.es6 +263 -0
- data/app/assets/javascripts/decidim/vizzs/metrics.js.es6 +36 -26
- data/app/assets/javascripts/decidim/vizzs/orgchart.js.es6 +3 -2
- data/app/assets/javascripts/decidim/vizzs/rowchart.js.es6 +324 -0
- data/app/assets/stylesheets/decidim/_decidim.scss +1 -0
- data/app/assets/stylesheets/decidim/modules/_cards.scss +1 -0
- data/app/assets/stylesheets/decidim/modules/_conference-diploma.scss +75 -0
- data/app/assets/stylesheets/decidim/modules/_conference-media.scss +44 -0
- data/app/assets/stylesheets/decidim/modules/_conference-programme.scss +5 -1
- data/app/assets/stylesheets/decidim/modules/_conference-registration.scss +34 -0
- data/app/assets/stylesheets/decidim/modules/_list-request.scss +16 -0
- data/app/assets/stylesheets/decidim/modules/_modules.scss +4 -4
- data/app/assets/stylesheets/decidim/modules/_process-phase.scss +1 -0
- data/app/assets/stylesheets/decidim/modules/_reveal.scss +6 -1
- data/app/assets/stylesheets/decidim/utils/_helpers.scss +1 -1
- data/app/assets/stylesheets/decidim/{modules → vizzs}/_areachart.scss +8 -11
- data/app/assets/stylesheets/decidim/{modules → vizzs}/_chart-tooltip.scss +0 -0
- data/app/assets/stylesheets/decidim/vizzs/_linechart.scss +115 -0
- data/app/assets/stylesheets/decidim/vizzs/_rowchart.scss +77 -0
- data/app/cells/decidim/activities/show.erb +3 -0
- data/app/cells/decidim/activities_cell.rb +38 -0
- data/app/cells/decidim/activity/show.erb +21 -0
- data/app/cells/decidim/activity_cell.rb +85 -0
- data/app/cells/decidim/address/details.erb +7 -0
- data/app/cells/decidim/address/show.erb +14 -0
- data/app/cells/decidim/address_cell.rb +19 -0
- data/app/cells/decidim/author/contact.erb +1 -1
- data/app/cells/decidim/author_cell.rb +1 -0
- data/app/cells/decidim/badge/show.erb +2 -2
- data/app/cells/decidim/badge/small.erb +5 -0
- data/app/cells/decidim/badge_cell.rb +36 -14
- data/app/cells/decidim/badges/show.erb +6 -3
- data/app/cells/decidim/badges_cell.rb +4 -4
- data/app/cells/decidim/coauthorships_cell.rb +8 -2
- data/app/cells/decidim/collapsible_authors/show.erb +9 -7
- data/app/cells/decidim/content_blocks/html/show.erb +3 -0
- data/app/cells/decidim/content_blocks/html_cell.rb +11 -0
- data/app/cells/decidim/content_blocks/html_settings_form/show.erb +3 -0
- data/app/cells/decidim/content_blocks/html_settings_form_cell.rb +17 -0
- data/app/cells/decidim/content_blocks/last_activity/show.erb +17 -0
- data/app/cells/decidim/content_blocks/last_activity_cell.rb +60 -0
- data/app/cells/decidim/content_blocks/metrics/show.erb +13 -0
- data/app/cells/decidim/content_blocks/metrics_cell.rb +18 -0
- data/app/cells/decidim/content_blocks/stats/show.erb +2 -1
- data/app/cells/decidim/groups/show.erb +10 -0
- data/app/cells/decidim/groups_cell.rb +19 -0
- data/app/cells/decidim/members/show.erb +9 -0
- data/app/cells/decidim/members_cell.rb +32 -0
- data/app/cells/decidim/profile/show.erb +3 -11
- data/app/cells/decidim/profile/user_group_tabs.erb +5 -0
- data/app/cells/decidim/profile/user_tabs.erb +12 -0
- data/app/cells/decidim/profile_cell.rb +7 -2
- data/app/cells/decidim/profile_sidebar/show.erb +108 -23
- data/app/cells/decidim/profile_sidebar_cell.rb +36 -2
- data/app/cells/decidim/user_group_admin_membership_profile/footer.erb +29 -0
- data/app/cells/decidim/user_group_admin_membership_profile_cell.rb +14 -0
- data/app/cells/decidim/user_group_membership_profile/tags.erb +1 -0
- data/app/cells/decidim/user_group_membership_profile_cell.rb +8 -0
- data/app/cells/decidim/user_group_pending_invitations_list/show.erb +23 -0
- data/app/cells/decidim/user_group_pending_invitations_list_cell.rb +26 -0
- data/app/cells/decidim/user_group_pending_requests_list/show.erb +23 -0
- data/app/cells/decidim/user_group_pending_requests_list_cell.rb +26 -0
- data/app/cells/decidim/user_profile/header.erb +1 -1
- data/app/cells/decidim/user_profile_cell.rb +15 -9
- data/app/commands/decidim/accept_group_invitation.rb +43 -0
- data/app/commands/decidim/accept_user_group_join_request.rb +53 -0
- data/app/commands/decidim/create_follow.rb +6 -0
- data/app/commands/decidim/create_registration.rb +13 -23
- data/app/commands/decidim/create_user_group.rb +57 -0
- data/app/commands/decidim/delete_follow.rb +7 -0
- data/app/commands/decidim/demote_membership.rb +57 -0
- data/app/commands/decidim/destroy_account.rb +6 -0
- data/app/commands/decidim/invite_user.rb +1 -3
- data/app/commands/decidim/invite_user_to_group.rb +62 -0
- data/app/commands/decidim/join_user_group.rb +63 -0
- data/app/commands/decidim/leave_user_group.rb +41 -0
- data/app/commands/decidim/promote_membership.rb +55 -0
- data/app/commands/decidim/reject_group_invitation.rb +42 -0
- data/app/commands/decidim/reject_user_group_join_request.rb +53 -0
- data/app/commands/decidim/remove_user_from_group.rb +53 -0
- data/app/commands/decidim/update_user_group.rb +53 -0
- data/app/controllers/concerns/decidim/locale_switcher.rb +3 -3
- data/app/controllers/concerns/decidim/paginable.rb +1 -0
- data/app/controllers/decidim/application_controller.rb +7 -0
- data/app/controllers/decidim/devise/omniauth_registrations_controller.rb +1 -1
- data/app/controllers/decidim/devise/sessions_controller.rb +1 -1
- data/app/controllers/decidim/gamification/badges_controller.rb +11 -0
- data/app/controllers/decidim/group_admins_controller.rb +41 -0
- data/app/controllers/decidim/group_invites_controller.rb +74 -0
- data/app/controllers/decidim/group_members_controller.rb +59 -0
- data/app/controllers/decidim/groups_controller.rb +85 -0
- data/app/controllers/decidim/last_activities_controller.rb +46 -0
- data/app/controllers/decidim/pages_controller.rb +9 -1
- data/app/controllers/decidim/profiles_controller.rb +35 -5
- data/app/controllers/decidim/user_group_join_requests_controller.rb +69 -0
- data/app/events/decidim/demoted_membership_event.rb +28 -0
- data/app/events/decidim/invited_to_group_event.rb +33 -0
- data/app/events/decidim/join_request_accepted_event.rb +28 -0
- data/app/events/decidim/join_request_created_event.rb +28 -0
- data/app/events/decidim/join_request_rejected_event.rb +28 -0
- data/app/events/decidim/promoted_to_admin_event.rb +28 -0
- data/app/events/decidim/removed_from_group_event.rb +28 -0
- data/app/forms/decidim/account_form.rb +1 -1
- data/app/forms/decidim/invite_user_to_group_form.rb +29 -0
- data/app/forms/decidim/notifications_settings_form.rb +4 -0
- data/app/forms/decidim/registration_form.rb +0 -27
- data/app/forms/decidim/user_group_form.rb +81 -0
- data/app/helpers/decidim/component_path_helper.rb +10 -0
- data/app/helpers/decidim/filters_helper.rb +3 -2
- data/app/helpers/decidim/icon_helper.rb +3 -1
- data/app/helpers/decidim/map_helper.rb +1 -1
- data/app/jobs/decidim/metric_job.rb +14 -0
- data/app/mailers/decidim/newsletter_mailer.rb +2 -0
- data/app/mailers/decidim/notification_mailer.rb +1 -1
- data/app/models/decidim/action_log.rb +66 -0
- data/app/models/decidim/coauthorship.rb +9 -0
- data/app/models/decidim/component.rb +5 -0
- data/app/models/decidim/continuity_badge_status.rb +9 -0
- data/app/models/decidim/gamification/badge_score.rb +1 -1
- data/app/models/decidim/messaging/message.rb +1 -0
- data/app/models/decidim/metric.rb +13 -0
- data/app/models/decidim/participatory_space_private_user.rb +4 -0
- data/app/models/decidim/user.rb +14 -38
- data/app/models/decidim/user_base_entity.rb +52 -0
- data/app/models/decidim/user_group.rb +48 -9
- data/app/models/decidim/user_group_membership.rb +8 -0
- data/app/permissions/decidim/permissions.rb +21 -0
- data/app/presenters/decidim/admin_log/organization_presenter.rb +0 -2
- data/app/presenters/decidim/admin_log/participatory_space_private_user_presenter.rb +38 -0
- data/app/presenters/decidim/metric_charts_presenter.rb +53 -0
- data/app/presenters/decidim/metric_object_presenter.rb +28 -0
- data/app/presenters/decidim/user_group_presenter.rb +16 -8
- data/app/presenters/decidim/user_presenter.rb +14 -0
- data/app/queries/decidim/metric_manage.rb +59 -0
- data/app/queries/decidim/metrics/users_metric_manage.rb +26 -0
- data/app/queries/decidim/user_groups/accepted_memberships.rb +36 -0
- data/app/queries/decidim/user_groups/accepted_user_groups.rb +38 -0
- data/app/queries/decidim/user_groups/accepted_users.rb +36 -0
- data/app/queries/decidim/user_groups/admin_memberships.rb +37 -0
- data/app/queries/decidim/user_groups/invited_memberships.rb +36 -0
- data/app/queries/decidim/user_groups/manageable_user_groups.rb +39 -0
- data/app/queries/decidim/user_groups/member_memberships.rb +37 -0
- data/app/resolvers/decidim/core/metric_resolver.rb +38 -0
- data/app/services/decidim/action_logger.rb +4 -2
- data/app/services/decidim/activity_search.rb +76 -0
- data/app/services/decidim/continuity_badge_tracker.rb +64 -0
- data/app/services/decidim/resource_search.rb +0 -1
- data/app/types/decidim/core/metric_history_type.rb +17 -0
- data/app/types/decidim/core/metric_type.rb +14 -0
- data/app/types/decidim/core/session_type.rb +1 -1
- data/app/types/decidim/core/user_group_type.rb +2 -2
- data/app/views/decidim/authorization_modals/show.html.erb +40 -27
- data/app/views/decidim/devise/registrations/new.html.erb +0 -19
- data/app/views/decidim/gamification/badges/index.html.erb +42 -0
- data/app/views/decidim/group_admins/index.html.erb +18 -0
- data/app/views/decidim/group_invites/index.html.erb +27 -0
- data/app/views/decidim/group_members/index.html.erb +19 -0
- data/app/views/decidim/groups/_form.html.erb +23 -0
- data/app/views/decidim/groups/edit.html.erb +26 -0
- data/app/views/decidim/groups/new.html.erb +26 -0
- data/app/views/decidim/last_activities/_activities.html.erb +13 -0
- data/app/views/decidim/last_activities/index.html.erb +18 -0
- data/app/views/decidim/last_activities/index.js.erb +6 -0
- data/app/views/decidim/profiles/show.html.erb +1 -1
- data/app/views/layouts/decidim/_user_menu.html.erb +0 -1
- data/app/views/layouts/decidim/_wrapper.html.erb +1 -1
- data/config/initializers/devise.rb +1 -1
- data/config/initializers/foundation_rails_helper.rb +1 -0
- data/config/locales/ca.yml +325 -32
- data/config/locales/de.yml +325 -32
- data/config/locales/en.yml +325 -32
- data/config/locales/es-PY.yml +325 -32
- data/config/locales/es.yml +325 -32
- data/config/locales/eu.yml +325 -32
- data/config/locales/fi.yml +330 -37
- data/config/locales/fr.yml +325 -32
- data/config/locales/gl.yml +325 -32
- data/config/locales/hu.yml +327 -34
- data/config/locales/it.yml +325 -32
- data/config/locales/nl.yml +325 -32
- data/config/locales/pl.yml +329 -32
- data/config/locales/pt-BR.yml +326 -33
- data/config/locales/pt.yml +325 -32
- data/config/locales/ru.yml +4 -33
- data/config/locales/sv.yml +346 -53
- data/config/locales/uk.yml +4 -33
- data/config/routes.rb +27 -1
- data/db/migrate/20170128112958_change_user_groups_verified_to_timestamp.rb +11 -0
- data/db/migrate/20180705134647_create_decidim_metrics.rb +16 -0
- data/db/migrate/20180730071851_add_core_content_blocks.rb +3 -3
- data/db/migrate/20180810092428_move_organization_fields_to_hero_content_block.rb +4 -2
- data/db/migrate/20180918072506_add_visibility_to_action_logs.rb +8 -0
- data/db/migrate/20181001124950_move_users_groups_to_users_table.rb +84 -0
- data/db/migrate/20181008102144_add_badge_switch_to_organizations.rb +8 -0
- data/db/migrate/20181010044613_create_decidim_continuity_badge_statuses.rb +11 -0
- data/db/migrate/20181011080252_add_roles_to_memberships.rb +24 -0
- data/db/migrate/20181016091601_make_authors_polymorphic.rb +31 -0
- data/db/migrate/20181029112820_fix_user_follows.rb +18 -0
- data/db/migrate/20181030090144_destroy_deleted_users_follows.rb +16 -0
- data/db/seeds.rb +18 -4
- data/lib/decidim/attributes.rb +1 -0
- data/lib/decidim/attributes/localized_date.rb +16 -0
- data/lib/decidim/attributes/time_with_zone.rb +3 -1
- data/lib/decidim/authorable.rb +5 -4
- data/lib/decidim/authorization_form_builder.rb +2 -2
- data/lib/decidim/coauthorable.rb +68 -18
- data/lib/decidim/content_block_manifest.rb +7 -0
- data/lib/decidim/content_processor.rb +17 -7
- data/lib/decidim/core.rb +12 -0
- data/lib/decidim/core/engine.rb +54 -6
- data/lib/decidim/core/test/factories.rb +63 -17
- data/lib/decidim/core/test/shared_examples/coauthorable.rb +27 -9
- data/lib/decidim/core/test/shared_examples/coauthorable_interface_examples.rb +2 -2
- data/lib/decidim/core/version.rb +1 -1
- data/lib/decidim/data_portability.rb +3 -1
- data/lib/decidim/data_portability_file_reader.rb +1 -1
- data/lib/decidim/events/author_event.rb +4 -1
- data/lib/decidim/events/coauthor_event.rb +4 -1
- data/lib/decidim/faker/localized.rb +5 -4
- data/lib/decidim/form_builder.rb +18 -17
- data/lib/decidim/gamification.rb +8 -2
- data/lib/decidim/gamification/badge.rb +34 -0
- data/lib/decidim/gamification/badge_scorer.rb +29 -14
- data/lib/decidim/gamification/badge_status.rb +2 -0
- data/lib/decidim/hashtaggable.rb +1 -1
- data/lib/decidim/manifest_registry.rb +5 -3
- data/lib/decidim/metric_manifest.rb +20 -0
- data/lib/decidim/metric_registry.rb +71 -0
- data/lib/decidim/participable.rb +1 -1
- data/lib/decidim/participatory_space_resourceable.rb +0 -1
- data/lib/decidim/query_extensions.rb +19 -0
- data/lib/decidim/resourceable.rb +1 -0
- data/lib/decidim/searchable.rb +2 -1
- data/lib/tasks/decidim_metrics_tasks.rake +41 -0
- data/lib/tasks/decidim_tasks.rake +1 -0
- data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.ca.js +1 -2
- data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.es.js +1 -2
- data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.fr.js +1 -2
- data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.gl.js +1 -2
- data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.pt.js +1 -2
- data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.ru.js +1 -2
- data/vendor/assets/javascripts/datepicker-locales/foundation-datepicker.uk.js +1 -2
- data/vendor/assets/javascripts/form_datepicker.js.es6 +1 -11
- metadata +144 -23
- data/app/cells/decidim/invitations_toggle/content.erb +0 -1
- data/app/cells/decidim/invitations_toggle/label.erb +0 -1
- data/app/cells/decidim/invitations_toggle_cell.rb +0 -27
- data/app/cells/decidim/toggle/show.erb +0 -8
- data/app/cells/decidim/toggle_cell.rb +0 -42
- data/app/commands/decidim/invite_friends.rb +0 -48
- data/app/controllers/decidim/invitations_controller.rb +0 -32
- data/app/forms/decidim/invitations_form.rb +0 -37
- data/app/views/decidim/invitations/index.html.erb +0 -48
- data/app/views/devise/mailer/invite_friend.html.erb +0 -27
- data/app/views/devise/mailer/invite_friend.text.erb +0 -19
- data/lib/decidim/rectify_ext.rb +0 -32
@@ -5,6 +5,7 @@ module Decidim
|
|
5
5
|
include Decidim::Messaging::ConversationHelper
|
6
6
|
include Decidim::IconHelper
|
7
7
|
include Decidim::ViewHooksHelper
|
8
|
+
include Decidim::ApplicationHelper
|
8
9
|
|
9
10
|
helper_method :profile_user, :logged_in?, :current_user
|
10
11
|
|
@@ -21,11 +22,44 @@ module Decidim
|
|
21
22
|
end
|
22
23
|
|
23
24
|
def profile_user
|
24
|
-
@profile_user ||=
|
25
|
+
@profile_user ||= present(model)
|
25
26
|
end
|
26
27
|
|
27
28
|
def can_contact_user?
|
28
|
-
!current_user || (current_user && current_user != model)
|
29
|
+
!current_user || (current_user && current_user != model && profile_user.can_be_contacted?)
|
30
|
+
end
|
31
|
+
|
32
|
+
def officialization_text
|
33
|
+
profile_user.officialization_text
|
34
|
+
end
|
35
|
+
|
36
|
+
def can_edit_user_group_profile?
|
37
|
+
return false unless current_user
|
38
|
+
return false if model.is_a?(Decidim::User)
|
39
|
+
Decidim::UserGroups::ManageableUserGroups.for(current_user).include?(model)
|
40
|
+
end
|
41
|
+
|
42
|
+
def profile_user_can_follow?
|
43
|
+
profile_user.can_follow?
|
44
|
+
end
|
45
|
+
|
46
|
+
def badge_statuses
|
47
|
+
Decidim::Gamification.badges.select { |badge| badge.valid_for?(profile_holder) }.map do |badge|
|
48
|
+
status = Decidim::Gamification.status_for(profile_holder, badge.name)
|
49
|
+
status.level.positive? ? status : nil
|
50
|
+
end.compact
|
51
|
+
end
|
52
|
+
|
53
|
+
def can_join_user_group?
|
54
|
+
return false unless current_user
|
55
|
+
return false if model.is_a?(Decidim::User)
|
56
|
+
Decidim::UserGroupMembership.where(user: current_user, user_group: model).empty?
|
57
|
+
end
|
58
|
+
|
59
|
+
def can_leave_group?
|
60
|
+
return false unless current_user
|
61
|
+
return false if model.is_a?(Decidim::User)
|
62
|
+
Decidim::UserGroupMembership.where(user: current_user, user_group: model).where.not(role: :creator).any?
|
29
63
|
end
|
30
64
|
end
|
31
65
|
end
|
@@ -0,0 +1,29 @@
|
|
1
|
+
<div class="card__footer">
|
2
|
+
<div class="card__support">
|
3
|
+
<% if admin_membership? %>
|
4
|
+
<%= link_to(
|
5
|
+
t("decidim.group_admins.actions.demote_admin"),
|
6
|
+
decidim.demote_group_manage_admin_path(model.user_group.nickname, model),
|
7
|
+
method: :post,
|
8
|
+
data: { confirm: t("decidim.group_admins.actions.are_you_sure") },
|
9
|
+
class: "card__button button secondary button--sc small light"
|
10
|
+
) %>
|
11
|
+
<% else %>
|
12
|
+
<%= link_to(
|
13
|
+
t("decidim.group_members.actions.promote_to_admin"),
|
14
|
+
decidim.promote_group_manage_user_path(model.user_group.nickname, model),
|
15
|
+
method: :post,
|
16
|
+
data: { confirm: t("decidim.group_members.actions.are_you_sure") },
|
17
|
+
class: "card__button button secondary button--sc small light"
|
18
|
+
) %>
|
19
|
+
|
20
|
+
<%= link_to(
|
21
|
+
t("decidim.group_members.actions.remove_from_group"),
|
22
|
+
decidim.group_manage_user_path(model.user_group.nickname, model),
|
23
|
+
method: :delete,
|
24
|
+
data: { confirm: t("decidim.group_members.actions.are_you_sure") },
|
25
|
+
class: "card__button button secondary button--sc small light"
|
26
|
+
) %>
|
27
|
+
<% end %>
|
28
|
+
</div>
|
29
|
+
</div>
|
@@ -0,0 +1,14 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
# This cell renders the profile of the given membership in the admin section.
|
5
|
+
# It includes links to manage the membership: promote/demote admin, remove
|
6
|
+
# from group.
|
7
|
+
class UserGroupAdminMembershipProfileCell < Decidim::UserGroupMembershipProfileCell
|
8
|
+
delegate :user, to: :model
|
9
|
+
|
10
|
+
def admin_membership?
|
11
|
+
model.role == "admin"
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
@@ -0,0 +1 @@
|
|
1
|
+
<p>Role: <strong><%= t(model.role, scope: "decidim.groups.roles") %></strong></p>
|
@@ -0,0 +1,23 @@
|
|
1
|
+
<section class="section list-invitation">
|
2
|
+
<p><%= t("decidim.group_invites.accept_or_reject_group_invitations") %></p>
|
3
|
+
<% invitations.each do |invitation| %>
|
4
|
+
<div class="flex--sbc">
|
5
|
+
<%= cell "decidim/author", present(invitation.user_group) %>
|
6
|
+
|
7
|
+
<div>
|
8
|
+
<%= link_to(
|
9
|
+
t("decidim.group_invites.accept_invitation"),
|
10
|
+
decidim.group_invite_path(invitation.user_group.nickname, invitation.id),
|
11
|
+
method: :patch,
|
12
|
+
class: "card__button button small light success"
|
13
|
+
) %>
|
14
|
+
<%= link_to(
|
15
|
+
t("decidim.group_invites.reject_invitation"),
|
16
|
+
decidim.group_invite_path(invitation.user_group.nickname, invitation.id),
|
17
|
+
method: :delete,
|
18
|
+
class: "card__button button small light"
|
19
|
+
) %>
|
20
|
+
</div>
|
21
|
+
</div>
|
22
|
+
<% end %>
|
23
|
+
</section>
|
@@ -0,0 +1,26 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
# This cell is intended to be used on user profiles.
|
5
|
+
# Lists the invitations to user groups the given user has.
|
6
|
+
class UserGroupPendingInvitationsListCell < Decidim::ViewModel
|
7
|
+
include Decidim::CellsPaginateHelper
|
8
|
+
include Decidim::ApplicationHelper
|
9
|
+
include Decidim::Core::Engine.routes.url_helpers
|
10
|
+
include Decidim::CardHelper
|
11
|
+
|
12
|
+
def show
|
13
|
+
return if invitations.empty?
|
14
|
+
return unless own_profile?
|
15
|
+
render :show
|
16
|
+
end
|
17
|
+
|
18
|
+
def invitations
|
19
|
+
@invitations ||= Decidim::UserGroups::InvitedMemberships.for(model)
|
20
|
+
end
|
21
|
+
|
22
|
+
def own_profile?
|
23
|
+
current_user == model
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
@@ -0,0 +1,23 @@
|
|
1
|
+
<section class="section list-request">
|
2
|
+
<p><%= t("decidim.groups.members.accept_or_reject_join_requests") %></p>
|
3
|
+
<% requests.each do |request| %>
|
4
|
+
<div class="flex--sbc">
|
5
|
+
<%= cell "decidim/author", present(request.user) %>
|
6
|
+
|
7
|
+
<div>
|
8
|
+
<%= link_to(
|
9
|
+
t("decidim.groups.members.accept_request"),
|
10
|
+
decidim.group_join_request_path(model.nickname, request),
|
11
|
+
method: :patch,
|
12
|
+
class: "card__button button small light success"
|
13
|
+
) %>
|
14
|
+
<%= link_to(
|
15
|
+
t("decidim.groups.members.reject_request"),
|
16
|
+
decidim.group_join_request_path(model.nickname, request),
|
17
|
+
method: :delete,
|
18
|
+
class: "card__button button small light"
|
19
|
+
) %>
|
20
|
+
</div>
|
21
|
+
</div>
|
22
|
+
<% end %>
|
23
|
+
</section>
|
@@ -0,0 +1,26 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
# This cell is intended to be used on profiles.
|
5
|
+
# Lists the pending join requests of the given user group.
|
6
|
+
class UserGroupPendingRequestsListCell < Decidim::ViewModel
|
7
|
+
include Decidim::CellsPaginateHelper
|
8
|
+
include Decidim::ApplicationHelper
|
9
|
+
include Decidim::Core::Engine.routes.url_helpers
|
10
|
+
include Decidim::CardHelper
|
11
|
+
|
12
|
+
def show
|
13
|
+
return if requests.empty?
|
14
|
+
return unless current_user_is_manager?
|
15
|
+
render :show
|
16
|
+
end
|
17
|
+
|
18
|
+
def requests
|
19
|
+
@requests ||= Decidim::UserGroupMembership.includes(:user).where(user_group: model, role: "requested")
|
20
|
+
end
|
21
|
+
|
22
|
+
def current_user_is_manager?
|
23
|
+
Decidim::UserGroups::ManageableUserGroups.for(current_user).include?(model)
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
@@ -8,7 +8,7 @@
|
|
8
8
|
<div>
|
9
9
|
<div class="author__name--container">
|
10
10
|
<%= link_to name, resource_path, class: "author__name" %>
|
11
|
-
<%= icon
|
11
|
+
<%= icon badge, class: "author__verified" if badge.present? %>
|
12
12
|
</div>
|
13
13
|
<%= link_to nickname, resource_path, class: "author__nickname" %>
|
14
14
|
</div>
|
@@ -3,24 +3,30 @@
|
|
3
3
|
module Decidim
|
4
4
|
# This cell renders the profile of the given user.
|
5
5
|
class UserProfileCell < Decidim::CardMCell
|
6
|
-
|
7
|
-
|
8
|
-
|
6
|
+
def user
|
7
|
+
model
|
8
|
+
end
|
9
9
|
|
10
10
|
def resource_path
|
11
|
-
decidim.profile_path(
|
11
|
+
decidim.profile_path(user.nickname)
|
12
12
|
end
|
13
13
|
|
14
|
-
|
15
|
-
|
16
|
-
|
14
|
+
delegate :nickname, to: :presented_resource
|
15
|
+
delegate :name, to: :presented_resource
|
16
|
+
delegate :officialized?, to: :presented_resource
|
17
|
+
|
18
|
+
delegate :badge, to: :presented_resource
|
17
19
|
|
18
20
|
def description
|
19
|
-
html_truncate(
|
21
|
+
html_truncate(user.about.to_s, length: 100)
|
20
22
|
end
|
21
23
|
|
22
24
|
def avatar
|
23
|
-
|
25
|
+
user.avatar_url(:big)
|
26
|
+
end
|
27
|
+
|
28
|
+
def presented_resource
|
29
|
+
@presented_resource ||= user.class.name.include?("Presenter") ? model : present(user)
|
24
30
|
end
|
25
31
|
end
|
26
32
|
end
|
@@ -0,0 +1,43 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
# A command with all the business logic to accept an invitation to belong to a
|
5
|
+
# group.
|
6
|
+
class AcceptGroupInvitation < Rectify::Command
|
7
|
+
# Public: Initializes the command.
|
8
|
+
#
|
9
|
+
# user_group - the UserGroup where the user has been invited
|
10
|
+
# user - the User that has been invited
|
11
|
+
def initialize(user_group, user)
|
12
|
+
@user_group = user_group
|
13
|
+
@user = user
|
14
|
+
end
|
15
|
+
|
16
|
+
# Executes the command. Broadcasts these events:
|
17
|
+
#
|
18
|
+
# - :ok when everything is valid.
|
19
|
+
# - :invalid if we couldn't proceed.
|
20
|
+
#
|
21
|
+
# Returns nothing.
|
22
|
+
def call
|
23
|
+
return broadcast(:invalid) if membership.blank?
|
24
|
+
|
25
|
+
accept_invitation
|
26
|
+
|
27
|
+
broadcast(:ok)
|
28
|
+
end
|
29
|
+
|
30
|
+
private
|
31
|
+
|
32
|
+
attr_reader :user_group, :user
|
33
|
+
|
34
|
+
def accept_invitation
|
35
|
+
membership.role = :member
|
36
|
+
membership.save!
|
37
|
+
end
|
38
|
+
|
39
|
+
def membership
|
40
|
+
@membership ||= Decidim::UserGroupMembership.find_by(user: user, user_group: user_group, role: :invited)
|
41
|
+
end
|
42
|
+
end
|
43
|
+
end
|
@@ -0,0 +1,53 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
# A command with all the business logic to accept a join request to a user
|
5
|
+
# group.
|
6
|
+
class AcceptUserGroupJoinRequest < Rectify::Command
|
7
|
+
# Public: Initializes the command.
|
8
|
+
#
|
9
|
+
# membership - the UserGroupMembership to be accepted.
|
10
|
+
def initialize(membership)
|
11
|
+
@membership = membership
|
12
|
+
end
|
13
|
+
|
14
|
+
# Executes the command. Broadcasts these events:
|
15
|
+
#
|
16
|
+
# - :ok when everything is valid.
|
17
|
+
# - :invalid if we couldn't proceed.
|
18
|
+
#
|
19
|
+
# Returns nothing.
|
20
|
+
def call
|
21
|
+
return broadcast(:invalid) if membership.role.to_s != "requested"
|
22
|
+
|
23
|
+
transaction do
|
24
|
+
accept_membership
|
25
|
+
send_notification
|
26
|
+
end
|
27
|
+
|
28
|
+
broadcast(:ok, @user_group)
|
29
|
+
end
|
30
|
+
|
31
|
+
private
|
32
|
+
|
33
|
+
attr_reader :membership
|
34
|
+
|
35
|
+
def accept_membership
|
36
|
+
membership.role = :member
|
37
|
+
membership.save!
|
38
|
+
end
|
39
|
+
|
40
|
+
def send_notification
|
41
|
+
Decidim::EventsManager.publish(
|
42
|
+
event: "decidim.events.groups.join_request_accepted",
|
43
|
+
event_class: JoinRequestAcceptedEvent,
|
44
|
+
resource: membership.user_group,
|
45
|
+
recipient_ids: [membership.user.id],
|
46
|
+
extra: {
|
47
|
+
user_group_name: membership.user_group.name,
|
48
|
+
user_group_nickname: membership.user_group.nickname
|
49
|
+
}
|
50
|
+
)
|
51
|
+
end
|
52
|
+
end
|
53
|
+
end
|
@@ -22,6 +22,7 @@ module Decidim
|
|
22
22
|
return broadcast(:invalid) if form.invalid?
|
23
23
|
|
24
24
|
create_follow!
|
25
|
+
increment_score
|
25
26
|
|
26
27
|
broadcast(:ok, follow)
|
27
28
|
end
|
@@ -36,5 +37,10 @@ module Decidim
|
|
36
37
|
user: current_user
|
37
38
|
)
|
38
39
|
end
|
40
|
+
|
41
|
+
def increment_score
|
42
|
+
return unless form.followable.is_a? Decidim::User
|
43
|
+
Decidim::Gamification.increment_score(form.followable, :followers)
|
44
|
+
end
|
39
45
|
end
|
40
46
|
end
|
@@ -2,7 +2,6 @@
|
|
2
2
|
|
3
3
|
module Decidim
|
4
4
|
# A command with all the business logic to create a user through the sign up form.
|
5
|
-
# It enables the option to sign up as a user group.
|
6
5
|
class CreateRegistration < Rectify::Command
|
7
6
|
# Public: Initializes the command.
|
8
7
|
#
|
@@ -20,10 +19,7 @@ module Decidim
|
|
20
19
|
def call
|
21
20
|
return broadcast(:invalid) if form.invalid?
|
22
21
|
|
23
|
-
|
24
|
-
create_user
|
25
|
-
create_user_group if form.user_group?
|
26
|
-
end
|
22
|
+
create_user
|
27
23
|
|
28
24
|
broadcast(:ok, @user)
|
29
25
|
end
|
@@ -33,24 +29,18 @@ module Decidim
|
|
33
29
|
attr_reader :form
|
34
30
|
|
35
31
|
def create_user
|
36
|
-
@user = User.create!(
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
def create_user_group
|
49
|
-
UserGroupMembership.create!(user: @user,
|
50
|
-
user_group: UserGroup.new(name: form.user_group_name,
|
51
|
-
document_number: form.user_group_document_number,
|
52
|
-
phone: form.user_group_phone,
|
53
|
-
decidim_organization_id: form.current_organization.id))
|
32
|
+
@user = User.create!(
|
33
|
+
email: form.email,
|
34
|
+
name: form.name,
|
35
|
+
nickname: form.nickname,
|
36
|
+
password: form.password,
|
37
|
+
password_confirmation: form.password_confirmation,
|
38
|
+
organization: form.current_organization,
|
39
|
+
tos_agreement: form.tos_agreement,
|
40
|
+
newsletter_notifications_at: form.newsletter_at,
|
41
|
+
email_on_notification: true,
|
42
|
+
accepted_tos_version: form.current_organization.tos_version
|
43
|
+
)
|
54
44
|
end
|
55
45
|
end
|
56
46
|
end
|