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
@@ -0,0 +1,53 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
# A command with all the business logic to remove a user from a group.
|
5
|
+
class RemoveUserFromGroup < Rectify::Command
|
6
|
+
# Public: Initializes the command.
|
7
|
+
#
|
8
|
+
# membership - the UserGroupMembership to be accepted.
|
9
|
+
def initialize(membership, user_group)
|
10
|
+
@membership = membership
|
11
|
+
@user_group = user_group
|
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.blank?
|
22
|
+
return broadcast(:invalid) if membership.user_group != user_group
|
23
|
+
|
24
|
+
transaction do
|
25
|
+
remove_membership
|
26
|
+
send_notification
|
27
|
+
end
|
28
|
+
|
29
|
+
broadcast(:ok)
|
30
|
+
end
|
31
|
+
|
32
|
+
private
|
33
|
+
|
34
|
+
attr_reader :membership, :user_group
|
35
|
+
|
36
|
+
def remove_membership
|
37
|
+
membership.destroy!
|
38
|
+
end
|
39
|
+
|
40
|
+
def send_notification
|
41
|
+
Decidim::EventsManager.publish(
|
42
|
+
event: "decidim.events.groups.removed_from_group",
|
43
|
+
event_class: RemovedFromGroupEvent,
|
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
|
@@ -0,0 +1,53 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
# A command with all the business logic to update a user group profile.
|
5
|
+
class UpdateUserGroup < Rectify::Command
|
6
|
+
# Public: Initializes the command.
|
7
|
+
#
|
8
|
+
# form - A form object with the params.
|
9
|
+
# user_group - The user group to update
|
10
|
+
def initialize(form, user_group)
|
11
|
+
@form = form
|
12
|
+
@user_group = user_group
|
13
|
+
end
|
14
|
+
|
15
|
+
# Executes the command. Broadcasts these events:
|
16
|
+
#
|
17
|
+
# - :ok when everything is valid.
|
18
|
+
# - :invalid if the form wasn't valid and we couldn't proceed.
|
19
|
+
#
|
20
|
+
# Returns nothing.
|
21
|
+
def call
|
22
|
+
return broadcast(:invalid) if form.invalid?
|
23
|
+
|
24
|
+
update_user_group
|
25
|
+
|
26
|
+
broadcast(:ok, @user_group)
|
27
|
+
end
|
28
|
+
|
29
|
+
private
|
30
|
+
|
31
|
+
attr_reader :form, :user_group
|
32
|
+
|
33
|
+
def update_user_group
|
34
|
+
user_group_attributes = attributes
|
35
|
+
user_group_attributes[:avatar] = form.avatar if form.avatar.present?
|
36
|
+
user_group.update(user_group_attributes)
|
37
|
+
end
|
38
|
+
|
39
|
+
def attributes
|
40
|
+
{
|
41
|
+
email: form.email,
|
42
|
+
name: form.name,
|
43
|
+
nickname: form.nickname,
|
44
|
+
about: form.about,
|
45
|
+
avatar: form.avatar,
|
46
|
+
extended_data: {
|
47
|
+
phone: form.phone,
|
48
|
+
document_number: form.document_number
|
49
|
+
}
|
50
|
+
}
|
51
|
+
end
|
52
|
+
end
|
53
|
+
end
|
@@ -8,20 +8,20 @@ module Decidim
|
|
8
8
|
extend ActiveSupport::Concern
|
9
9
|
|
10
10
|
included do
|
11
|
-
|
11
|
+
around_action :switch_locale
|
12
12
|
helper_method :current_locale, :available_locales, :default_locale
|
13
13
|
|
14
14
|
# Sets the locale for the current session.
|
15
15
|
#
|
16
16
|
# Returns nothing.
|
17
|
-
def
|
17
|
+
def switch_locale(&action)
|
18
18
|
locale = if params["locale"]
|
19
19
|
params["locale"]
|
20
20
|
elsif current_user && current_user.locale.present?
|
21
21
|
current_user.locale
|
22
22
|
end
|
23
23
|
|
24
|
-
I18n.
|
24
|
+
I18n.with_locale(available_locales.include?(locale) ? locale : default_locale, &action)
|
25
25
|
end
|
26
26
|
|
27
27
|
# Adds the current locale to all the URLs generated by url_for so users
|
@@ -35,6 +35,8 @@ module Decidim
|
|
35
35
|
|
36
36
|
skip_before_action :disable_http_caching, unless: :user_signed_in?
|
37
37
|
|
38
|
+
before_action :track_continuity_badge
|
39
|
+
|
38
40
|
private
|
39
41
|
|
40
42
|
# Stores the url where the user will be redirected after login.
|
@@ -70,5 +72,10 @@ module Decidim
|
|
70
72
|
def add_vary_header
|
71
73
|
response.headers["Vary"] = "Accept"
|
72
74
|
end
|
75
|
+
|
76
|
+
def track_continuity_badge
|
77
|
+
return unless current_user
|
78
|
+
ContinuityBadgeTracker.new(current_user).track!(Time.zone.today)
|
79
|
+
end
|
73
80
|
end
|
74
81
|
end
|
@@ -61,7 +61,7 @@ module Decidim
|
|
61
61
|
end
|
62
62
|
|
63
63
|
def first_login_and_not_authorized?(user)
|
64
|
-
user.is_a?(User) && user.sign_in_count == 1 && Decidim::Verifications.workflows.any?
|
64
|
+
user.is_a?(User) && user.sign_in_count == 1 && Decidim::Verifications.workflows.any? && user.verifiable?
|
65
65
|
end
|
66
66
|
|
67
67
|
def action_missing(action_name)
|
@@ -23,7 +23,7 @@ module Decidim
|
|
23
23
|
end
|
24
24
|
|
25
25
|
def first_login_and_not_authorized?(user)
|
26
|
-
user.is_a?(User) && user.sign_in_count == 1 && current_organization.available_authorizations.any?
|
26
|
+
user.is_a?(User) && user.sign_in_count == 1 && current_organization.available_authorizations.any? && user.verifiable?
|
27
27
|
end
|
28
28
|
|
29
29
|
def after_sign_out_path_for(user)
|
@@ -0,0 +1,41 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
# The controller to manage user groups admins
|
5
|
+
class GroupAdminsController < Decidim::ApplicationController
|
6
|
+
include FormFactory
|
7
|
+
|
8
|
+
helper_method :user_group
|
9
|
+
|
10
|
+
def index
|
11
|
+
enforce_permission_to :manage, :user_group, user_group: user_group
|
12
|
+
end
|
13
|
+
|
14
|
+
def demote
|
15
|
+
enforce_permission_to :manage, :user_group, user_group: user_group
|
16
|
+
|
17
|
+
DemoteMembership.call(membership, user_group) do
|
18
|
+
on(:ok) do
|
19
|
+
flash[:notice] = t("group_admins.demote.success", scope: "decidim")
|
20
|
+
|
21
|
+
redirect_back fallback_location: group_manage_users_path(user_group.nickname)
|
22
|
+
end
|
23
|
+
|
24
|
+
on(:invalid) do
|
25
|
+
flash[:alert] = t("group_admins.demote.error", scope: "decidim")
|
26
|
+
redirect_back fallback_location: group_manage_users_path(user_group.nickname)
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
30
|
+
|
31
|
+
private
|
32
|
+
|
33
|
+
def user_group
|
34
|
+
@user_group ||= Decidim::UserGroups::ManageableUserGroups.for(current_user).find_by(nickname: params[:group_id])
|
35
|
+
end
|
36
|
+
|
37
|
+
def membership
|
38
|
+
user_group.memberships.find(params[:id])
|
39
|
+
end
|
40
|
+
end
|
41
|
+
end
|
@@ -0,0 +1,74 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
# The controller to manage user groups invitations
|
5
|
+
class GroupInvitesController < Decidim::ApplicationController
|
6
|
+
include FormFactory
|
7
|
+
|
8
|
+
helper_method :user_group
|
9
|
+
|
10
|
+
def index
|
11
|
+
enforce_permission_to :manage, :user_group, user_group: user_group
|
12
|
+
@form = form(InviteUserToGroupForm).instance
|
13
|
+
end
|
14
|
+
|
15
|
+
def create
|
16
|
+
enforce_permission_to :manage, :user_group, user_group: user_group
|
17
|
+
@form = form(InviteUserToGroupForm).from_params(params)
|
18
|
+
|
19
|
+
InviteUserToGroup.call(@form, user_group) do
|
20
|
+
on(:ok) do
|
21
|
+
flash[:notice] = t("group_invites.invite.success", scope: "decidim")
|
22
|
+
redirect_to profile_path(user_group.nickname)
|
23
|
+
end
|
24
|
+
|
25
|
+
on(:invalid) do
|
26
|
+
flash[:alert] = t("group_invites.invite.error", scope: "decidim")
|
27
|
+
render action: :index
|
28
|
+
end
|
29
|
+
end
|
30
|
+
end
|
31
|
+
|
32
|
+
def update
|
33
|
+
enforce_permission_to :accept, :user_group_invitations
|
34
|
+
|
35
|
+
AcceptGroupInvitation.call(inviting_user_group, current_user) do
|
36
|
+
on(:ok) do
|
37
|
+
flash[:notice] = t("group_invites.accept.success", scope: "decidim")
|
38
|
+
redirect_to profile_groups_path(current_user.nickname)
|
39
|
+
end
|
40
|
+
|
41
|
+
on(:invalid) do
|
42
|
+
flash[:alert] = t("group_invites.accept.error", scope: "decidim")
|
43
|
+
redirect_to profile_groups_path(current_user.nickname)
|
44
|
+
end
|
45
|
+
end
|
46
|
+
end
|
47
|
+
|
48
|
+
def destroy
|
49
|
+
enforce_permission_to :reject, :user_group_invitations
|
50
|
+
|
51
|
+
RejectGroupInvitation.call(inviting_user_group, current_user) do
|
52
|
+
on(:ok) do
|
53
|
+
flash[:notice] = t("group_invites.reject.success", scope: "decidim")
|
54
|
+
redirect_to profile_groups_path(current_user.nickname)
|
55
|
+
end
|
56
|
+
|
57
|
+
on(:invalid) do
|
58
|
+
flash[:alert] = t("group_invites.reject.error", scope: "decidim")
|
59
|
+
redirect_to profile_groups_path(current_user.nickname)
|
60
|
+
end
|
61
|
+
end
|
62
|
+
end
|
63
|
+
|
64
|
+
private
|
65
|
+
|
66
|
+
def user_group
|
67
|
+
@user_group ||= Decidim::UserGroups::ManageableUserGroups.for(current_user).find_by(nickname: params[:group_id])
|
68
|
+
end
|
69
|
+
|
70
|
+
def inviting_user_group
|
71
|
+
@inviting_user_group ||= Decidim::UserGroups::InvitedMemberships.for(current_user).find_by(id: params[:id]).user_group
|
72
|
+
end
|
73
|
+
end
|
74
|
+
end
|
@@ -0,0 +1,59 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
# The controller to manage user groups members
|
5
|
+
class GroupMembersController < Decidim::ApplicationController
|
6
|
+
include FormFactory
|
7
|
+
|
8
|
+
helper_method :user_group
|
9
|
+
|
10
|
+
def index
|
11
|
+
enforce_permission_to :manage, :user_group, user_group: user_group
|
12
|
+
end
|
13
|
+
|
14
|
+
# Removes a user from a user group
|
15
|
+
def destroy
|
16
|
+
enforce_permission_to :manage, :user_group, user_group: user_group
|
17
|
+
|
18
|
+
RemoveUserFromGroup.call(membership, user_group) do
|
19
|
+
on(:ok) do
|
20
|
+
flash[:notice] = t("group_members.remove.success", scope: "decidim")
|
21
|
+
|
22
|
+
redirect_back fallback_location: group_manage_users_path(user_group.nickname)
|
23
|
+
end
|
24
|
+
|
25
|
+
on(:invalid) do
|
26
|
+
flash[:alert] = t("group_members.remove.error", scope: "decidim")
|
27
|
+
redirect_back fallback_location: group_manage_users_path(user_group.nickname)
|
28
|
+
end
|
29
|
+
end
|
30
|
+
end
|
31
|
+
|
32
|
+
def promote
|
33
|
+
enforce_permission_to :manage, :user_group, user_group: user_group
|
34
|
+
|
35
|
+
PromoteMembership.call(membership, user_group) do
|
36
|
+
on(:ok) do
|
37
|
+
flash[:notice] = t("group_members.promote.success", scope: "decidim")
|
38
|
+
|
39
|
+
redirect_back fallback_location: group_manage_users_path(user_group.nickname)
|
40
|
+
end
|
41
|
+
|
42
|
+
on(:invalid) do
|
43
|
+
flash[:alert] = t("group_members.promote.error", scope: "decidim")
|
44
|
+
redirect_back fallback_location: group_manage_users_path(user_group.nickname)
|
45
|
+
end
|
46
|
+
end
|
47
|
+
end
|
48
|
+
|
49
|
+
private
|
50
|
+
|
51
|
+
def user_group
|
52
|
+
@user_group ||= Decidim::UserGroups::ManageableUserGroups.for(current_user).find_by(nickname: params[:group_id])
|
53
|
+
end
|
54
|
+
|
55
|
+
def membership
|
56
|
+
user_group.memberships.find(params[:id])
|
57
|
+
end
|
58
|
+
end
|
59
|
+
end
|
@@ -0,0 +1,85 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
# The controller to handle user groups creation
|
5
|
+
class GroupsController < Decidim::ApplicationController
|
6
|
+
include FormFactory
|
7
|
+
|
8
|
+
def new
|
9
|
+
enforce_permission_to :create, :user_group, current_user: current_user
|
10
|
+
@form = form(UserGroupForm).instance
|
11
|
+
end
|
12
|
+
|
13
|
+
def create
|
14
|
+
enforce_permission_to :create, :user_group, current_user: current_user
|
15
|
+
@form = form(UserGroupForm).from_params(params)
|
16
|
+
|
17
|
+
CreateUserGroup.call(@form) do
|
18
|
+
on(:ok) do |user_group|
|
19
|
+
flash[:notice] = t("groups.create.success", scope: "decidim")
|
20
|
+
|
21
|
+
redirect_to profile_path(user_group.nickname)
|
22
|
+
end
|
23
|
+
|
24
|
+
on(:invalid) do
|
25
|
+
flash[:alert] = t("groups.create.error", scope: "decidim")
|
26
|
+
render action: :new
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
30
|
+
|
31
|
+
def edit
|
32
|
+
enforce_permission_to :manage, :user_group, current_user: current_user, user_group: user_group
|
33
|
+
@form = form(UserGroupForm).from_model(user_group)
|
34
|
+
end
|
35
|
+
|
36
|
+
def update
|
37
|
+
enforce_permission_to :manage, :user_group, current_user: current_user, user_group: user_group
|
38
|
+
@form = form(UserGroupForm).from_params(user_group_params)
|
39
|
+
|
40
|
+
UpdateUserGroup.call(@form, user_group) do
|
41
|
+
on(:ok) do |user_group|
|
42
|
+
flash[:notice] = t("groups.update.success", scope: "decidim")
|
43
|
+
|
44
|
+
redirect_to profile_path(user_group.nickname)
|
45
|
+
end
|
46
|
+
|
47
|
+
on(:invalid) do
|
48
|
+
flash[:alert] = t("groups.update.error", scope: "decidim")
|
49
|
+
render action: :edit
|
50
|
+
end
|
51
|
+
end
|
52
|
+
end
|
53
|
+
|
54
|
+
def leave
|
55
|
+
enforce_permission_to :leave, :user_group, user_group: accepted_user_group
|
56
|
+
|
57
|
+
LeaveUserGroup.call(current_user, accepted_user_group) do
|
58
|
+
on(:ok) do
|
59
|
+
flash[:notice] = t("groups.leave.success", scope: "decidim")
|
60
|
+
|
61
|
+
redirect_back fallback_location: profile_path(accepted_user_group.nickname)
|
62
|
+
end
|
63
|
+
|
64
|
+
on(:invalid) do
|
65
|
+
flash[:alert] = t("groups.leave.error", scope: "decidim")
|
66
|
+
redirect_back fallback_location: profile_path(accepted_user_group.nickname)
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
70
|
+
|
71
|
+
private
|
72
|
+
|
73
|
+
def accepted_user_group
|
74
|
+
@accepted_user_group ||= Decidim::UserGroups::AcceptedUserGroups.for(current_user).find_by(nickname: params[:id])
|
75
|
+
end
|
76
|
+
|
77
|
+
def user_group
|
78
|
+
@user_group ||= Decidim::UserGroups::ManageableUserGroups.for(current_user).find_by(nickname: params[:id])
|
79
|
+
end
|
80
|
+
|
81
|
+
def user_group_params
|
82
|
+
params[:group].merge(id: user_group.id)
|
83
|
+
end
|
84
|
+
end
|
85
|
+
end
|