decidim-conferences 0.23.3 → 0.24.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76e05e50396ac0d639819e9355e1dd1c08519aabeed44643ae6b20f116e1539e
-  data.tar.gz: 052d02f80f30d28808ce7b9c3b3017f418ffb49b5d969deec9c75becc93a0bbe
+  metadata.gz: 7067bdca600b96ce7d27aa7efdd85416c140cd84dbf050a381c0fbb1bc799ea4
+  data.tar.gz: 508e299dff1426f7d4485ce803fa8ecdbc71d39978ebe624d37e10db4f26747e
 SHA512:
-  metadata.gz: f98072cd1897a9e4c5e824665c0d39fe7745ec41a88bf85239babd0510d4f51da2e416170ef9b3930941c03d827d53cf7a91a90428b3cff11b480ca74f9bdd5d
-  data.tar.gz: a1868c81d78d0407e67a0ca4fabaf60cc2102f50490b63cb3945f77d3e69f1a8ea552071cd827a093e253fe43e406d81c18de7167f67679892241eb1a0f55a44
+  metadata.gz: 12cb8ede1e06dce01b7c33c6b7ec470c1ff8f4e9f9d4ef3a5cd3bb5759643660b37dabcb415db0b0e22f89881deaea6170c74a5ad50935330e275859f17ee833
+  data.tar.gz: a14098ba7b5452ddc42697cecdf72bb0182013a56010a13d808786eb524392749b012542049442a1e79fa48ef92130bde6ee4261701dd3629072d49c095581d2

data/app/cells/decidim/conferences/conference_speaker/show.erb

@@ -70,7 +70,7 @@
       <hr class="reset mt-none mb-s">
       <div class="row">
         <div class="column medium-12">
-          <div class="bio-acts">Speaking at</div>
+          <div class="bio-acts"><%= t("conferences.conference_speaker.show.speaking_at", scope: "decidim") %></div>
 
           <ul class="list-reset">
             <% meetings.each do |meeting| %>

data/app/cells/decidim/conferences/media_link/show.erb

@@ -2,7 +2,7 @@
   <%= icon "external-link", role: "img", "aria-hidden": true %>
   <div>
     <%= link_to model.link, target: "_blank" do %>
-      <strong><%= translated_attribute(model.title) %> </strong>
+      <strong><%= decidim_html_escape  translated_attribute(model.title) %> </strong>
     <% end %>
     <div class="text-small"><%= l(model.date, format: :decidim_short_with_month_name_short) %> · <%= model.link %></div>
   </div>

data/app/cells/decidim/conferences/media_link_cell.rb

@@ -5,6 +5,7 @@ module Decidim
     # This cell renders the media link card for an instance of a MediaLink
     class MediaLinkCell < Decidim::ViewModel
       include Decidim::LayoutHelper
+      include Decidim::SanitizeHelper
 
       def show
         render

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

@@ -25,18 +25,52 @@ module Decidim
         def call
           return broadcast(:invalid) if form.invalid?
 
-          transaction do
-            create_conference_speaker!
-            link_meetings(@conference_speaker)
-          end
+          # We are going to assign the attributes only to handle the validation of the avatar before accessing
+          # `create_conference_speaker!` which uses `create!`, and this will render an ActiveRecord::RecordInvalid error
+          # After we assign and check if the object is valid, we will not save the model to let it be handled the old way
+          # If there is an error we add the error to the form
+          # We are using this method to assign the conference because if we are trying to assign all at once, there will be thrown a
+          # Delegation error
+
+          if conference_speaker_with_attributes.valid?
 
-          broadcast(:ok)
+            transaction do
+              create_conference_speaker!
+              link_meetings(@conference_speaker)
+            end
+            broadcast(:ok)
+          else
+            form.errors.add(:avatar, conference_speaker_with_attributes.errors[:avatar]) if conference_speaker_with_attributes.errors.include? :avatar
+
+            broadcast(:invalid)
+          end
         end
 
         private
 
         attr_reader :form, :conference, :current_user
 
+        def conference_speaker_with_attributes
+          attrs = form.attributes.slice(
+            :full_name,
+            :twitter_handle,
+            :personal_url,
+            :avatar,
+            :remove_avatar,
+            :position,
+            :affiliation,
+            :short_bio
+          ).merge(
+            decidim_conference_id: conference.id,
+            conference: conference,
+            user: form.user
+          )
+          conference_speaker = conference.speakers.build
+          conference_speaker.conference = conference
+          conference_speaker.assign_attributes(attrs)
+          conference_speaker
+        end
+
         def create_conference_speaker!
           log_info = {
             resource: {
@@ -50,19 +84,7 @@ module Decidim
           @conference_speaker = Decidim.traceability.create!(
             Decidim::ConferenceSpeaker,
             current_user,
-            form.attributes.slice(
-              :full_name,
-              :position,
-              :affiliation,
-              :short_bio,
-              :twitter_handle,
-              :personal_url,
-              :avatar,
-              :remove_avatar
-            ).merge(
-              conference: conference,
-              user: form.user
-            ),
+            conference_speaker_with_attributes.attributes,
             log_info
           )
         end

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

@@ -25,11 +25,17 @@ module Decidim
         def call
           return broadcast(:invalid) if form.invalid?
 
-          transaction do
-            create_partner!
-          end
+          if conference_partner.valid?
+            transaction do
+              create_partner!
+            end
+
+            broadcast(:ok)
+          else
+            form.errors.add(:logo, conference_partner.errors[:logo]) if conference_partner.errors.include? :logo
 
-          broadcast(:ok)
+            broadcast(:invalid)
+          end
         end
 
         private
@@ -49,19 +55,32 @@ module Decidim
           @partner = Decidim.traceability.create!(
             Decidim::Conferences::Partner,
             form.current_user,
-            { conference: conference }.merge(
-              form.attributes.slice(
-                :name,
-                :weight,
-                :link,
-                :partner_type,
-                :logo,
-                :remove_avatar
-              )
-            ),
+            attributes,
             log_info
           )
         end
+
+        def conference_partner
+          return @conference_partner if defined?(@conference_partner)
+
+          @conference_partner = conference.partners.build
+          @conference_partner.conference = conference
+          @conference_partner.assign_attributes(attributes)
+          @conference_partner
+        end
+
+        def attributes
+          { conference: conference }.merge(
+            form.attributes.slice(
+              :name,
+              :weight,
+              :link,
+              :partner_type,
+              :logo,
+              :remove_avatar
+            )
+          )
+        end
       end
     end
   end

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

@@ -37,7 +37,7 @@ module Decidim
 
         def already_invited?
           return false unless user.persisted?
-          return false unless conference.conference_invites.where(user: user).exists?
+          return false unless conference.conference_invites.exists?(user: user)
 
           form.errors.add(:email, :already_invited)
           true

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

@@ -11,6 +11,7 @@ module Decidim
         # form - A form object with the params.
         # conference_speaker - The ConferenceSpeaker to update
         def initialize(form, conference_speaker)
+          form.avatar = conference_speaker.avatar if form.avatar.blank?
           @form = form
           @conference_speaker = conference_speaker
         end
@@ -25,18 +26,52 @@ module Decidim
           return broadcast(:invalid) if form.invalid?
           return broadcast(:invalid) unless conference_speaker
 
-          transaction do
-            update_conference_speaker!
-            link_meetings(@conference_speaker)
-          end
+          # We are going to assign the attributes only to handle the validation of the avatar before accessing
+          # `update_conference_speaker!` which uses `update!`. Without this step, the image validation may render
+          # an ActiveRecord::RecordInvalid error
+          # After we assign and check if the object is valid, we reload the model to let it be handled the old way
+          # If there is an error we add the error to the form
+          conference_speaker.assign_attributes(attributes)
+
+          if conference_speaker.valid?
+            conference_speaker.reload
 
-          broadcast(:ok)
+            transaction do
+              update_conference_speaker!
+              link_meetings(@conference_speaker)
+            end
+            broadcast(:ok)
+          else
+            form.errors.add(:avatar, conference_speaker.errors[:avatar]) if conference_speaker.errors.include? :avatar
+
+            broadcast(:invalid)
+          end
         end
 
         private
 
         attr_reader :form, :conference_speaker
 
+        def attributes
+          form.attributes.slice(
+            :full_name,
+            :twitter_handle,
+            :personal_url,
+            :position,
+            :affiliation,
+            :short_bio
+          ).merge(
+            user: form.user
+          ).merge(uploader_attributes)
+        end
+
+        def uploader_attributes
+          {
+            avatar: form.avatar,
+            remove_avatar: form.remove_avatar
+          }.delete_if { |_k, val| val.is_a?(Decidim::ApplicationUploader) }
+        end
+
         def update_conference_speaker!
           log_info = {
             resource: {
@@ -50,18 +85,7 @@ module Decidim
           Decidim.traceability.update!(
             conference_speaker,
             form.current_user,
-            form.attributes.slice(
-              :full_name,
-              :position,
-              :affiliation,
-              :short_bio,
-              :twitter_handle,
-              :personal_url,
-              :avatar,
-              :remove_avatar
-            ).merge(
-              user: form.user
-            ),
+            attributes,
             log_info
           )
         end

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

@@ -11,6 +11,8 @@ module Decidim
         # form - A form object with the params.
         # conference_partner - The ConferencePartner to update
         def initialize(form, conference_partner)
+          form.logo = conference_partner.logo if form.logo.blank?
+
           @form = form
           @conference_partner = conference_partner
         end
@@ -25,14 +27,39 @@ module Decidim
           return broadcast(:invalid) if form.invalid?
           return broadcast(:invalid) unless conference_partner
 
-          update_conference_partner!
-          broadcast(:ok)
+          # We are going to assign the attributes only to handle the validation of the avatar before accessing
+          # `update_conference_partner!` which uses `update!`. Without this step, the image validation may render
+          # an ActiveRecord::RecordInvalid error
+          # After we assign and check if the object is valid, we reload the model to let it be handled the old way
+          # If there is an error we add the error to the form
+          conference_partner.assign_attributes(attributes)
+          if conference_partner.valid?
+            conference_partner.reload
+
+            update_conference_partner!
+            broadcast(:ok)
+          else
+            form.errors.add(:logo, conference_partner.errors[:logo]) if conference_partner.errors.include? :logo
+
+            broadcast(:invalid)
+          end
         end
 
         private
 
         attr_reader :form, :conference_partner
 
+        def attributes
+          form.attributes.slice(
+            :name,
+            :weight,
+            :partner_type,
+            :link,
+            :logo,
+            :remove_logo
+          )
+        end
+
         def update_conference_partner!
           log_info = {
             resource: {
@@ -46,14 +73,7 @@ module Decidim
           Decidim.traceability.update!(
             conference_partner,
             form.current_user,
-            form.attributes.slice(
-              :name,
-              :weight,
-              :partner_type,
-              :link,
-              :logo,
-              :remove_logo
-            ),
+            attributes,
             log_info
           )
         end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    module Admin
+      # This controller allows importing things.
+      # It is targeted for customizations for importing things that lives under
+      # an conference.
+      class ImportsController < Decidim::Admin::ImportsController
+        include Concerns::ConferenceAdmin
+      end
+    end
+  end
+end

data/app/controllers/decidim/conferences/admin/moderations/reports_controller.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    module Admin
+      module Moderations
+        # This controller allows admins to manage moderation reports in an conference.
+        class ReportsController < Decidim::Admin::Moderations::ReportsController
+          include Concerns::ConferenceAdmin
+        end
+      end
+    end
+  end
+end

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

@@ -11,7 +11,7 @@ module Decidim
       end
 
       def i18n_role
-        I18n.t(extra["role"], "decidim.admin.models.conference_user_role.roles", default: extra["role"])
+        I18n.t(extra["role"], scope: "decidim.admin.models.conference_user_role.roles", default: extra["role"])
       end
 
       def i18n_options

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

@@ -43,7 +43,7 @@ module Decidim
         def personal_url
           return if super.blank?
 
-          return "http://" + super unless super.match?(%r{\A(http|https)://}i)
+          return "http://#{super}" unless super.match?(%r{\A(http|https)://}i)
 
           super
         end

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

@@ -21,7 +21,7 @@ module Decidim
         def link
           return if super.blank?
 
-          return "http://" + super unless super.match?(%r{\A(http|https)://}i)
+          return "http://#{super}" unless super.match?(%r{\A(http|https)://}i)
 
           super
         end

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

@@ -17,6 +17,7 @@ module Decidim
         attribute :remove_logo
 
         validates :name, :partner_type, presence: true, if: ->(form) { form.logo.present? }
+        validates :logo, presence: true, unless: ->(form) { form.logo.present? }
         validates :logo, passthru: {
           to: Decidim::Conferences::Partner,
           with: {
@@ -38,7 +39,7 @@ module Decidim
         def link
           return if super.blank?
 
-          return "http://" + super unless super.match?(%r{\A(http|https)://}i)
+          return "http://#{super}" unless super.match?(%r{\A(http|https)://}i)
 
           super
         end

data/app/models/decidim/conference_meeting.rb

@@ -4,7 +4,7 @@ module Decidim
   # It represents a meeting of the conference
   class ConferenceMeeting < Decidim::Meetings::Meeting
     has_many :conference_speaker_conference_meetings, dependent: :destroy
-    has_many :conference_speakers, through: :conference_speaker_conference_meetings, foreign_key: "conference_meeting_id", class_name: "Decidim::ConferenceSpeaker"
+    has_many :conference_speakers, through: :conference_speaker_conference_meetings, class_name: "Decidim::ConferenceSpeaker"
     has_many :conference_meeting_registration_types, dependent: :destroy
     has_many :registration_types, through: :conference_meeting_registration_types, foreign_key: "registration_type_id", class_name: "Decidim::Conferences::RegistrationType"
   end

data/app/models/decidim/conference_speaker.rb

@@ -14,7 +14,7 @@ module Decidim
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User", optional: true
     belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
     has_many :conference_speaker_conference_meetings, dependent: :destroy
-    has_many :conference_meetings, through: :conference_speaker_conference_meetings, foreign_key: "conference_speaker_id", class_name: "Decidim::ConferenceMeeting"
+    has_many :conference_meetings, through: :conference_speaker_conference_meetings, class_name: "Decidim::ConferenceMeeting"
 
     default_scope { order(full_name: :asc, created_at: :asc) }