decidim-conferences 0.26.2 → 0.27.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e81c5875c1af1a30928771f575b635bc717f99a9de8d1fd23be1665b6ec55c74
-  data.tar.gz: ab09f828b04bf7d3d004e76b0a69941f3d5f0ca1511fe95a229ef973f6ba70c3
+  metadata.gz: 29979928a0cb12542825bb861b06988ea576c515ae69a3c117c2f9b9302aeb68
+  data.tar.gz: c8695a0af17d5d7ad12ab5efd60e8f0b9c3a1ca45c2e10ad01be12554800bb5c
 SHA512:
-  metadata.gz: 5a4c53dc5e261e6dd3018d1782022630906e60c62ab6b26293b9ea11d61b8ed8c1418bf5e9525bb1071e867d9b606fa500bd06fd32b57bb60f7cd00a56e6c5b8
-  data.tar.gz: 69f61b21f6803f5b9e574c84786862f3710698b8f4c1fb646188aa967b00124e85a5609824628ea7f1d1ac914495c1d590e91a17aff9296d0158f6c76d8aa4c6
+  metadata.gz: c1d0807fc33bd9ecda19113bdd3afd12eed1e69e228e8ecffdd5c12e212af6284515776e66c6b8e68b8ffafddc81c1e48e2d22a0f133b788b64f49e9ce845a1e
+  data.tar.gz: 7cb999e5bd53a31c3ee05498102bded3d9fdf8f9942e23caac33cac555c7b1763b7b08a84394503aadb3b11c41ffcfd705ba78b9b2d7f6f437500ad060e2bf5f

data/app/cells/decidim/conferences/content_blocks/highlighted_conferences/show.erb

@@ -1,4 +1,4 @@
-<section class="wrapper-home home-section">
+<section id="highlighted_conferences" class="wrapper-home home-section">
   <div class="row" id="highlighted-conferences">
     <h3 class="section-heading"><%= t("active_conferences", scope: i18n_scope) %></h3>
     <div class="row collapse">
@@ -8,7 +8,7 @@
           <div class="column">
             <%= link_to decidim_conferences.conference_path(conference), class: "card card--conference card--mini" do %>
               <div aria-hidden="true" class="card__image-top"
-                style="background-image:url(<%= conference.attached_uploader(:hero_image).path %>)"></div>
+                style="background-image:url('<%= conference.attached_uploader(:hero_image).path %>')"></div>
               <div class="card__content">
                 <span class="card__title card__link"><%= translated_attribute conference.title %></span>
               </div>

data/app/cells/decidim/conferences/content_blocks/highlighted_conferences_cell.rb

@@ -6,10 +6,6 @@ module Decidim
       class HighlightedConferencesCell < Decidim::ViewModel
         delegate :current_user, to: :controller
 
-        cache :show, expires_in: 10.minutes, if: :perform_caching? do
-          cache_hash
-        end
-
         def show
           render if highlighted_conferences.any?
         end
@@ -31,6 +27,7 @@ module Decidim
         def cache_hash
           hash = []
           hash.push(I18n.locale)
+          hash.push(highlighted_conferences.map(&:cache_key_with_version))
           hash.join(Decidim.cache_key_separator)
         end
       end

data/app/commands/decidim/conferences/admin/confirm_conference_registration.rb

@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # This command is executed when the user joins a conference.
-      class ConfirmConferenceRegistration < Rectify::Command
+      class ConfirmConferenceRegistration < Decidim::Command
         # Initializes a JoinConference Command.
         #
         # conference_registration - The registration to be confirmed
@@ -18,9 +18,9 @@ module Decidim
         #
         # Broadcasts :ok if successful, :invalid otherwise.
         def call
-          @conference_registration.with_lock do
-            return broadcast(:invalid) unless can_join_conference?
+          return broadcast(:invalid) unless can_join_conference?
 
+          @conference_registration.with_lock do
             confirm_registration
             send_email_confirmation
             send_notification_confirmation

data/app/commands/decidim/conferences/admin/copy_conference.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when copying a new participatory
       # conference in the system.
-      class CopyConference < Rectify::Command
+      class CopyConference < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

data/app/commands/decidim/conferences/admin/create_conference.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new
       # conference in the system.
-      class CreateConference < Rectify::Command
+      class CreateConference < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

data/app/commands/decidim/conferences/admin/create_conference_speaker.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new conference
       # speaker in the system.
-      class CreateConferenceSpeaker < Rectify::Command
+      class CreateConferenceSpeaker < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
@@ -52,24 +52,27 @@ module Decidim
 
         attr_reader :form, :conference, :current_user
 
-        def conference_speaker_with_attributes
-          attrs = form.attributes.slice(
-            :full_name,
-            :twitter_handle,
-            :personal_url,
-            :position,
-            :affiliation,
-            :short_bio
-          ).merge(
+        def conference_speaker_attributes
+          @conference_speaker_attributes ||= form.attributes.slice(
+            "full_name",
+            "twitter_handle",
+            "personal_url",
+            "position",
+            "affiliation",
+            "short_bio"
+          ).symbolize_keys.merge(
             decidim_conference_id: conference.id,
             conference: conference,
             user: form.user
           ).merge(
             attachment_attributes(:avatar)
           )
+        end
+
+        def conference_speaker_with_attributes
           conference_speaker = conference.speakers.build
           conference_speaker.conference = conference
-          conference_speaker.assign_attributes(attrs)
+          conference_speaker.assign_attributes(conference_speaker_attributes)
           conference_speaker
         end
 
@@ -86,7 +89,7 @@ module Decidim
           @conference_speaker = Decidim.traceability.create!(
             Decidim::ConferenceSpeaker,
             current_user,
-            conference_speaker_with_attributes.attributes,
+            conference_speaker_attributes,
             log_info
           )
         end

data/app/commands/decidim/conferences/admin/create_media_link.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new
       # media link for conference in the system.
-      class CreateMediaLink < Rectify::Command
+      class CreateMediaLink < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -50,11 +50,11 @@ module Decidim
             Decidim::Conferences::MediaLink,
             current_user,
             form.attributes.slice(
-              :title,
-              :link,
-              :weight,
-              :date
-            ).merge(
+              "title",
+              "link",
+              "weight",
+              "date"
+            ).symbolize_keys.merge(
               conference: conference
             ),
             log_info

data/app/commands/decidim/conferences/admin/create_partner.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new partner
       # in the system.
-      class CreatePartner < Rectify::Command
+      class CreatePartner < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -72,13 +72,13 @@ module Decidim
         def attributes
           { conference: conference }.merge(
             form.attributes.slice(
-              :name,
-              :weight,
-              :link,
-              :partner_type,
-              :logo,
-              :remove_avatar
-            )
+              "name",
+              "weight",
+              "link",
+              "partner_type",
+              "logo",
+              "remove_avatar"
+            ).symbolize_keys
           )
         end
       end

data/app/commands/decidim/conferences/admin/create_registration_type.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new registration type
       # in the system.
-      class CreateRegistrationType < Rectify::Command
+      class CreateRegistrationType < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -52,11 +52,11 @@ module Decidim
             Decidim::Conferences::RegistrationType,
             form.current_user,
             form.attributes.slice(
-              :title,
-              :description,
-              :price,
-              :weight
-            ).merge(
+              "title",
+              "description",
+              "price",
+              "weight"
+            ).symbolize_keys.merge(
               conference: conference
             ),
             log_info

data/app/commands/decidim/conferences/admin/destroy_conference_admin.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when destroying an conference
       # admin in the system.
-      class DestroyConferenceAdmin < Rectify::Command
+      class DestroyConferenceAdmin < Decidim::Command
         # Public: Initializes the command.
         #
         # role - the ConferenceUserRole to destroy

data/app/commands/decidim/conferences/admin/destroy_conference_speaker.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when destroying an conference
       # speaker in the system.
-      class DestroyConferenceSpeaker < Rectify::Command
+      class DestroyConferenceSpeaker < Decidim::Command
         # Public: Initializes the command.
         #
         # conference_speaker - the ConferenceSpeaker to destroy

data/app/commands/decidim/conferences/admin/destroy_media_link.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when destroying a media link
       # in the system.
-      class DestroyMediaLink < Rectify::Command
+      class DestroyMediaLink < Decidim::Command
         # Public: Initializes the command.
         #
         # media_link - the MediaLink to destroy

data/app/commands/decidim/conferences/admin/destroy_partner.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when destroying an conference
       # partner in the system.
-      class DestroyPartner < Rectify::Command
+      class DestroyPartner < Decidim::Command
         # Public: Initializes the command.
         #
         # conference_partner - the Partner to destroy

data/app/commands/decidim/conferences/admin/destroy_registration_type.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when destroying a conference
       # registration type in the system.
-      class DestroyRegistrationType < Rectify::Command
+      class DestroyRegistrationType < Decidim::Command
         # Public: Initializes the command.
         #
         # registration_type - the Partner to destroy

data/app/commands/decidim/conferences/admin/export_conference_registrations.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user exports the registrations of
       # a Conference from the admin panel.
-      class ExportConferenceRegistrations < Rectify::Command
+      class ExportConferenceRegistrations < Decidim::Command
         # conference - The current instance of the page to be closed.
         # format - a string representing the export format
         # current_user - the user performing the action

data/app/commands/decidim/conferences/admin/invite_user_to_join_conference.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic to invite users to join a conference.
       #
-      class InviteUserToJoinConference < Rectify::Command
+      class InviteUserToJoinConference < Decidim::Command
         # Public: Initializes the command.
         #
         # form         - A form object with the params.
@@ -86,16 +86,14 @@ module Decidim
         end
 
         def user
-          @user ||= begin
-            if form.existing_user
-              form.user
-            else
-              Decidim::User.find_or_initialize_by(
-                organization: form.current_organization,
-                email: form.email.downcase
-              )
-            end
-          end
+          @user ||= if form.existing_user
+                      form.user
+                    else
+                      Decidim::User.find_or_initialize_by(
+                        organization: form.current_organization,
+                        email: form.email.downcase
+                      )
+                    end
         end
 
         def invite_user_to_sign_up

data/app/commands/decidim/conferences/admin/notify_role_assigned_to_conference.rb

@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # A command to notify users when a role is assigned for a Conference
-      class NotifyRoleAssignedToConference < Rectify::Command
+      class NotifyRoleAssignedToConference < Decidim::Command
         def send_notification(user)
           Decidim::EventsManager.publish(
             event: "decidim.events.conferences.role_assigned",

data/app/commands/decidim/conferences/admin/publish_conference.rb

@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # A command that sets an conference as published.
-      class PublishConference < Rectify::Command
+      class PublishConference < Decidim::Command
         # Public: Initializes the command.
         #
         # conference - A Conference that will be published

data/app/commands/decidim/conferences/admin/publish_registration_type.rb

@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # This command gets called when a registration_type is published from the admin panel.
-      class PublishRegistrationType < Rectify::Command
+      class PublishRegistrationType < Decidim::Command
         # Public: Initializes the command.
         #
         # registration_type - The registration_type to publish.

data/app/commands/decidim/conferences/admin/send_conference_diplomas.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic to send diplomas to registered conference users.
       #
-      class SendConferenceDiplomas < Rectify::Command
+      class SendConferenceDiplomas < Decidim::Command
         # Public: Initializes the command.
         #
         # conference      - The conference which the user is invited to.

data/app/commands/decidim/conferences/admin/unpublish_conference.rb

@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # A command that sets an conference as unpublished.
-      class UnpublishConference < Rectify::Command
+      class UnpublishConference < Decidim::Command
         # Public: Initializes the command.
         #
         # conference - A Conference that will be published

data/app/commands/decidim/conferences/admin/unpublish_registration_type.rb

@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # This command gets called when a registration type is unpublished from the admin panel.
-      class UnpublishRegistrationType < Rectify::Command
+      class UnpublishRegistrationType < Decidim::Command
         # Public: Initializes the command.
         #
         # registration_type - The registration_type to unpublish.

data/app/commands/decidim/conferences/admin/update_conference.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new participatory
       # conference in the system.
-      class UpdateConference < Rectify::Command
+      class UpdateConference < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.

data/app/commands/decidim/conferences/admin/update_conference_speaker.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when updating a conference
       # speaker in the system.
-      class UpdateConferenceSpeaker < Rectify::Command
+      class UpdateConferenceSpeaker < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
@@ -55,13 +55,13 @@ module Decidim
 
         def attributes
           form.attributes.slice(
-            :full_name,
-            :twitter_handle,
-            :personal_url,
-            :position,
-            :affiliation,
-            :short_bio
-          ).merge(
+            "full_name",
+            "twitter_handle",
+            "personal_url",
+            "position",
+            "affiliation",
+            "short_bio"
+          ).symbolize_keys.merge(
             user: form.user
           ).merge(
             attachment_attributes(:avatar)

data/app/commands/decidim/conferences/admin/update_diploma.rb

@@ -4,7 +4,7 @@ module Decidim
   module Conferences
     module Admin
       # This command is executed when the user updates the conference diploma configuration.
-      class UpdateDiploma < Rectify::Command
+      class UpdateDiploma < Decidim::Command
         # Initializes a UpdateDiploma Command.
         #
         # form - The form from which to get the data.
@@ -18,9 +18,9 @@ module Decidim
         #
         # Broadcasts :ok if successful, :invalid otherwise.
         def call
-          @conference.with_lock do
-            return broadcast(:invalid) if form.invalid?
+          return broadcast(:invalid) if form.invalid?
 
+          @conference.with_lock do
             update_conference_diploma
             Decidim.traceability.perform_action!(:update_diploma, @conference, form.current_user) do
               @conference

data/app/commands/decidim/conferences/admin/update_media_link.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when updating a conference
       # speaker in the system.
-      class UpdateMediaLink < Rectify::Command
+      class UpdateMediaLink < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -50,11 +50,11 @@ module Decidim
             media_link,
             form.current_user,
             form.attributes.slice(
-              :title,
-              :link,
-              :weight,
-              :date
-            ),
+              "title",
+              "link",
+              "weight",
+              "date"
+            ).symbolize_keys,
             log_info
           )
         end

data/app/commands/decidim/conferences/admin/update_partner.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when updating a conference
       # partner in the system.
-      class UpdatePartner < Rectify::Command
+      class UpdatePartner < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
@@ -51,11 +51,11 @@ module Decidim
 
         def attributes
           form.attributes.slice(
-            :name,
-            :weight,
-            :partner_type,
-            :link
-          ).merge(
+            "name",
+            "weight",
+            "partner_type",
+            "link"
+          ).symbolize_keys.merge(
             attachment_attributes(:logo)
           )
         end

data/app/commands/decidim/conferences/admin/update_registration_type.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when updating a conference
       # registration type in the system.
-      class UpdateRegistrationType < Rectify::Command
+      class UpdateRegistrationType < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -51,11 +51,11 @@ module Decidim
             registration_type,
             form.current_user,
             form.attributes.slice(
-              :title,
-              :description,
-              :price,
-              :weight
-            ),
+              "title",
+              "description",
+              "price",
+              "weight"
+            ).symbolize_keys,
             log_info
           )
         end

data/app/commands/decidim/conferences/decline_invitation.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     # This command is executed when the user declines an invite to the conference.
-    class DeclineInvitation < Rectify::Command
+    class DeclineInvitation < Decidim::Command
       # Initializes a DeclineInvitation Command.
       #
       # conference - The current instance of the conference where user has been invited.

data/app/commands/decidim/conferences/join_conference.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     # This command is executed when the user joins a conference.
-    class JoinConference < Rectify::Command
+    class JoinConference < Decidim::Command
       # Initializes a JoinConference Command.
       #
       # conference - The current instance of the conference to be joined.
@@ -20,9 +20,9 @@ module Decidim
       #
       # Broadcasts :ok if successful, :invalid otherwise.
       def call
-        conference.with_lock do
-          return broadcast(:invalid) unless can_join_conference?
+        return broadcast(:invalid) unless can_join_conference?
 
+        conference.with_lock do
           create_registration
           create_meetings_registrations
           accept_invitation

data/app/commands/decidim/conferences/leave_conference.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Conferences
     # This command is executed when the user leaves a conference.
-    class LeaveConference < Rectify::Command
+    class LeaveConference < Decidim::Command
       # Initializes a LeaveConference Command.
       #
       # conference - The current instance of the conference to be left.
@@ -20,10 +20,10 @@ module Decidim
       #
       # Broadcasts :ok if successful, :invalid otherwise.
       def call
-        @conference.with_lock do
-          return broadcast(:invalid) unless registration
-          return broadcast(:invalid) unless meetings_registrations
+        return broadcast(:invalid) unless registration
+        return broadcast(:invalid) unless meetings_registrations
 
+        @conference.with_lock do
           destroy_registration
           destroy_meeting_registration
         end

data/app/controllers/decidim/conferences/admin/reminders_controller.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    module Admin
+      # This controller allows to send reminders.
+      # It is targeted for customizations for reminder things that lives under
+      # a conference.
+      class RemindersController < Decidim::Admin::RemindersController
+        include Concerns::ConferenceAdmin
+      end
+    end
+  end
+end

data/app/controllers/decidim/conferences/conference_program_controller.rb

@@ -26,9 +26,9 @@ module Decidim
       end
 
       def meetings
-        return unless meeting_component.published? || !meeting_component.presence
+        return unless meeting_component&.published? || !meeting_component.presence
 
-        @meetings ||= Decidim::Meetings::Meeting.where(component: meeting_component).visible_meeting_for(current_user).order(:start_time)
+        @meetings ||= Decidim::Meetings::Meeting.where(component: meeting_component).visible_for(current_user).order(:start_time)
       end
 
       def meeting_days

data/app/events/decidim/conferences/conference_registration_notification_event.rb

@@ -6,7 +6,7 @@ module Decidim
       include Decidim::Events::NotificationEvent
 
       def notification_title
-        I18n.t("notification_title", i18n_options).html_safe
+        I18n.t("notification_title", **i18n_options).html_safe
       end
 
       def i18n_options

data/app/events/decidim/conferences/conference_role_assigned_event.rb

@@ -7,7 +7,7 @@ module Decidim
       include Decidim::Events::AuthorEvent
 
       def notification_title
-        I18n.t("notification_title", i18n_options).html_safe
+        I18n.t("notification_title", **i18n_options).html_safe
       end
 
       def i18n_role

data/app/forms/decidim/conferences/admin/conference_registration_invite_form.rb

@@ -14,7 +14,7 @@ module Decidim
         attribute :existing_user, Boolean, default: false
 
         validates :name, presence: true, unless: proc { |object| object.existing_user }
-        validates :email, presence: true, 'valid_email_2/email': { disposable: true }, unless: proc { |object| object.existing_user }
+        validates :email, presence: true, "valid_email_2/email": { disposable: true }, unless: proc { |object| object.existing_user }
         validates :user, presence: true, if: proc { |object| object.existing_user }
 
         def user