decidim-conferences 0.26.7 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faced8239b16e418b66a94777cae4aa216fdafb22a61e2cd4b19e858270164ad
-  data.tar.gz: 7143492bbc300471e8cb7e761f900f3b2174eb81b5975f08d318e9f61cdca210
+  metadata.gz: 5258df72a4c5a6687ef76c3d1ab8083b6e031aa66063a3182614ea95127b510b
+  data.tar.gz: 32d40203166f672c3e29165aa814faf2d1c311e22014fea3ad4873153042af6f
 SHA512:
-  metadata.gz: c3e5e27cc3d3a54e574393e472325949361fa68995f493af98ac33b2ba8063ad7a63c1f007ed5e5cc441c565aca292c1d139771b5dd9df87aaf9ea92a526db54
-  data.tar.gz: 51c035ab413d05c295328106d82580f95a02e57a33be482057819a9047249fc69b98ec942447bb71500b807711a998b63f328fcc0d6c6dd544f2517e56ecb1e1
+  metadata.gz: ffd7e95539f0068f5cef41b91849b45ecb55900f5b590d9339d4dc68824f7f623555914f053eb697f68d4ddf3f41e0b2b8851e1c7077d04b8aa5cb960325183f
+  data.tar.gz: 6f3e0cace82753ab90c13041e86ec9bdacbb9278792cc615c46cdfb608a0d074dc19d31c4749d560d5a866ff913e95d0668035bca427b968c6f7162f7b39d3ab

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,9 +27,12 @@ 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
+
+        def cache_expiry_time
+          10.minutes
+        end
       end
     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.
@@ -54,13 +54,13 @@ module Decidim
 
         def conference_speaker_with_attributes
           attrs = 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(
             decidim_conference_id: conference.id,
             conference: conference,
             user: form.user

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,21 +86,19 @@ 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
           user.skip_reconfirmation!
-          user.invite!(invited_by, invitation_instructions: "join_conference", conference: conference, registration_type: form.registration_type)
+          user.invite!(invited_by, invitation_instructions: "join_conference", conference: conference)
         end
       end
     end

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.
@@ -21,11 +21,8 @@ module Decidim
       # Broadcasts :ok if successful, :invalid otherwise.
       def call
         return broadcast(:invalid) unless can_join_conference?
-        return broadcast(:ok) if already_joined_conference?
 
         conference.with_lock do
-          return broadcast(:invalid) unless can_join_conference?
-
           create_registration
           create_meetings_registrations
           accept_invitation
@@ -61,10 +58,6 @@ module Decidim
         conference.registrations_enabled? && conference.has_available_slots?
       end
 
-      def already_joined_conference?
-        conference.conference_registrations.where(user: user).any?
-      end
-
       def send_email_pending_validation
         Decidim::Conferences::ConferenceRegistrationMailer.pending_validation(user, conference, @registration_type).deliver_later
       end

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/conference_speakers_controller.rb

@@ -6,11 +6,10 @@ module Decidim
       # Controller that allows managing conference speakers.
       #
       class ConferenceSpeakersController < Decidim::Conferences::Admin::ApplicationController
+        helper Decidim::Conferences::Admin::ConferenceSpeakersHelper
         include Concerns::ConferenceAdmin
         include Decidim::Paginable
 
-        helper_method :conference_speaker, :meetings_selected
-
         def index
           enforce_permission_to :index, :conference_speaker
 
@@ -42,15 +41,17 @@ module Decidim
         end
 
         def edit
-          enforce_permission_to :update, :conference_speaker, speaker: conference_speaker
-          @form = form(ConferenceSpeakerForm).from_model(conference_speaker)
+          @item = collection.find(params[:id])
+          enforce_permission_to :update, :conference_speaker, speaker: @item
+          @form = form(ConferenceSpeakerForm).from_model(@item)
         end
 
         def update
-          enforce_permission_to :update, :conference_speaker, speaker: conference_speaker
+          @conference_speaker = collection.find(params[:id])
+          enforce_permission_to :update, :conference_speaker, speaker: @conference_speaker
           @form = form(ConferenceSpeakerForm).from_params(params)
 
-          UpdateConferenceSpeaker.call(@form, conference_speaker) do
+          UpdateConferenceSpeaker.call(@form, @conference_speaker) do
             on(:ok) do
               flash[:notice] = I18n.t("conference_speakers.update.success", scope: "decidim.admin")
               redirect_to conference_speakers_path(current_conference)
@@ -64,9 +65,10 @@ module Decidim
         end
 
         def destroy
-          enforce_permission_to :destroy, :conference_speaker, speaker: conference_speaker
+          @conference_speaker = collection.find(params[:id])
+          enforce_permission_to :destroy, :conference_speaker, speaker: @conference_speaker
 
-          DestroyConferenceSpeaker.call(conference_speaker, current_user) do
+          DestroyConferenceSpeaker.call(@conference_speaker, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("conference_speakers.destroy.success", scope: "decidim.admin")
               redirect_to conference_speakers_path(current_conference)
@@ -76,14 +78,6 @@ module Decidim
 
         private
 
-        def meetings_selected
-          @meetings_selected ||= @conference_speaker.conference_meetings.pluck(:id) if @conference_speaker.present?
-        end
-
-        def conference_speaker
-          @conference_speaker ||= collection.find(params[:id])
-        end
-
         def collection
           @collection ||= Decidim::ConferenceSpeaker.where(conference: current_conference)
         end