decidim-conferences 0.21.0 → 0.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99821cad74f86b23d2243a063e9c5f347aff5a1c8e284e8c8c0cc250c726da59
-  data.tar.gz: 681fd61ed392ae35e2f580fac6e6ff49e6fad73f90e2e87585a5e343042ef73b
+  metadata.gz: f7d8502a8f92d995cec27935a0965ee2e6f9dd3f90ed8f5bc1c1a3d7a32610be
+  data.tar.gz: 59b3ae649ad811e7d6efeaadf0189b6559e9654dd0bfa968232a5b3a79da74e4
 SHA512:
-  metadata.gz: dd9b00dae882f1a7e7aba6aced3e95ae4812abc5e7f81e2abf3f10cfa425a26cea3b6fef3c706ceae59cca30008e86c1fc505130b963668c888b13eecf8af285
-  data.tar.gz: 4ad9c3cfa57db46f38e22da1310323249f955d6c2f95b467ba62cbc184a7db7ff6b74e4bd60eec1bc75346f05bbf744674d2e8dbc07b2c1559e9d93559d78c84
+  metadata.gz: 86fc8af9b3022cd775795ccb96360b34130664bbac432e30a95a42dafc0d570a0c60e14bc29a390e6e34deae161dbe64fe6a98e976c2ee2dbd0792ed6700cce4
+  data.tar.gz: 3b6ff89eb36bef14a8f100b45d2191a544b0a98ab949e521ed365e53b824223e49585c41bf40974e03ed6270cdb4d737ecbee63a550c74d6a3ee581293d93997

data/app/assets/images/decidim/conferences/conference.svg

@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8">
-  <path d="M2.91-.03a1 1 0 0 0-.13.03 1 1 0 0 0-.78 1v2a1 1 0 1 0 2 0v-2a1 1 0 0 0-1.09-1.03zm-2.56 2.03a.5.5 0 0 0-.34.5v.5c0 1.48 1.09 2.69 2.5 2.94v1.06h-.5c-.55 0-1 .45-1 1h4.01c0-.55-.45-1-1-1h-.5v-1.06c1.41-.24 2.5-1.46 2.5-2.94v-.5a.5.5 0 1 0-1 0v.5c0 1.11-.89 2-2 2-1.11 0-2-.89-2-2v-.5a.5.5 0 0 0-.59-.5.5.5 0 0 0-.06 0z" transform="translate(1)"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8"><path d="M2.91-.03a1 1 0 0 0-.13.03 1 1 0 0 0-.78 1v2a1 1 0 1 0 2 0v-2a1 1 0 0 0-1.09-1.03zm-2.56 2.03a.5.5 0 0 0-.34.5v.5c0 1.48 1.09 2.69 2.5 2.94v1.06h-.5c-.55 0-1 .45-1 1h4.01c0-.55-.45-1-1-1h-.5v-1.06c1.41-.24 2.5-1.46 2.5-2.94v-.5a.5.5 0 1 0-1 0v.5c0 1.11-.89 2-2 2-1.11 0-2-.89-2-2v-.5a.5.5 0 0 0-.59-.5.5.5 0 0 0-.06 0z" transform="translate(1)"/></svg>

data/app/cells/decidim/conferences/conference_m/footer.erb

@@ -3,7 +3,7 @@
     <%= link_to(
       t(model.cta_button_text_key, scope: "layouts.decidim.conferences.conference"),
       resource_path,
-      class: "card__button button button--sc secondary light small"
+      class: "card__button button button--sc small"
     ) %>
   </div>
 </div>

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

@@ -14,6 +14,10 @@ module Decidim
 
       private
 
+      def title
+        decidim_html_escape(super)
+      end
+
       def has_image?
         true
       end

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

@@ -1,7 +1,7 @@
 <div class="column conference-speaker js-conference">
   <div class="speaker-img-wrapper">
     <div class="speaker-img">
-      <%= image_tag avatar.url %>
+      <%= image_tag avatar.url, alt: "speaker-image" %>
     </div>
   </div>
   <div class="speaker-data">
@@ -26,7 +26,7 @@
       <div class="column medium-6">
         <div class="speaker-img-wrapper">
           <div class="speaker-img">
-            <%= image_tag avatar.url %>
+            <%= image_tag avatar.url, alt: "speaker-image" %>
           </div>
         </div>
         <div class="speaker-data">

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

@@ -6,17 +6,13 @@
         large-up-4 card-grid">
         <% highlighted_conferences.each do |conference| %>
           <div class="column">
-            <article class="card card--conference card--mini">
-              <%= link_to decidim_conferences.conference_path(conference), class: "card__link" do %>
-                <div class="card__image-top"
-                  style="background-image:url(<%= conference.hero_image.url %>)"></div>
-              <% end %>
+            <%= 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.hero_image.url %>)"></div>
               <div class="card__content">
-                <%= link_to decidim_conferences.conference_path(conference), class: "card__link" do %>
-                  <h4 class="card__title"><%= translated_attribute conference.title %></h4>
-                <% end %>
+                <span class="card__title card__link"><%= translated_attribute conference.title %></span>
               </div>
-            </article>
+            <% end %>
           </div>
         <% end %>
       </div>
@@ -25,7 +21,10 @@
   <div class="row" id="see-all-conferences">
     <div class="columns small-centered small-12
       smallmedium-8 medium-6 large-4">
-      <%= link_to t("see_all_conferences", scope: i18n_scope), decidim_conferences.conferences_path, class: "button expanded hollow button--sc home-section__cta" %>
+      <%= link_to t("see_all_conferences", scope: i18n_scope),
+                  decidim_conferences.conferences_path,
+                  class: "button expanded hollow button--sc home-section__cta",
+                  title: t("conferences_button_title", scope: i18n_scope) %>
     </div>
   </div>
 </section>

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

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

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

@@ -19,7 +19,7 @@ module Decidim
       def logo
         return unless model.logo.presence
 
-        "<div class='card p-m flex--cc'> #{image_tag model.logo.medium.url} </div>"
+        "<div class='card p-m flex--cc'> #{image_tag model.logo.medium.url, alt: "logo"} </div>"
       end
     end
   end

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

@@ -1,15 +1,13 @@
 <div class="column">
-  <article class="card" data-open="media-picture-<%= index %>">
+  <div class="card" data-open="media-picture-<%= index %>">
     <div class="picture__content">
       <%= image_thumb %>
-      <h5 class="card__title">
-        <strong><%= title %></strong>
-      </h5>
+        <strong class="card__title"><%= title %></strong>
       <div class="text-small">
         <%= short_description %>
       </div>
     </div>
-  </article>
+  </div>
   <div id="media-picture-<%= index %>" class="reveal picture__modal" data-reveal>
     <div class="reveal__header">
       <h3 class="reveal__title"><%= t("conferences.photo.show.photo", scope: "decidim") %></h3>

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

@@ -18,11 +18,11 @@ module Decidim
       end
 
       def image_thumb
-        image_tag model.thumbnail_url
+        image_tag model.thumbnail_url, alt: t("alt", scope: "decidim.conferences.photo.image.attributes")
       end
 
       def image_big
-        image_tag model.big_url
+        image_tag model.big_url, alt: t("alt", scope: "decidim.conferences.photo.image.attributes")
       end
 
       def title

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

@@ -1,5 +1,5 @@
 <div class="section images">
-  <h4 class="section-heading"><%= t("conferences.photos_list.show.related_photos", scope: "decidim") %></h4>
+  <h3 class="section-heading"><%= t("conferences.photos_list.show.related_photos", scope: "decidim") %></h3>
   <div class="row small-up-1 smallmedium-up-2 card-grid">
     <% model.each_with_index do |photo, index| %>
       <%= cell "decidim/conferences/photo", photo, index: index %>

data/app/cells/decidim/conferences/registration_type/join_conference.erb

@@ -13,7 +13,7 @@
   <% else %>
     <%= render :registration_confirm %>
     <% if allowed? %>
-      <%= button_to i18n_join_text, "",
+      <%= button_to i18n_join_text, "#",
           class: button_classes,
           disabled: !conference.has_available_slots? || conference.has_registration_for?(current_user),
           style: "margin-bottom: 0;",

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

@@ -18,11 +18,11 @@ module Decidim
       delegate :current_user, to: :controller, prefix: false
 
       def title
-        translated_attribute model.title
+        decidim_sanitize translated_attribute model.title
       end
 
       def description
-        translated_attribute model.description
+        decidim_sanitize translated_attribute model.description
       end
 
       def price

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new conference
       # admin in the system.
-      class CreateConferenceAdmin < Rectify::Command
+      class CreateConferenceAdmin < NotifyRoleAssignedToConference
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -57,6 +57,7 @@ module Decidim
               conference: @conference
             )
           end
+          send_notification user
         end
 
         def existing_user

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

@@ -49,15 +49,15 @@ module Decidim
           @partner = Decidim.traceability.create!(
             Decidim::Conferences::Partner,
             form.current_user,
-            form.attributes.slice(
-              :name,
-              :weight,
-              :link,
-              :partner_type,
-              :logo,
-              :remove_avatar
-            ).merge(
-              conference: conference
+            { conference: conference }.merge(
+              form.attributes.slice(
+                :name,
+                :weight,
+                :link,
+                :partner_type,
+                :logo,
+                :remove_avatar
+              )
             ),
             log_info
           )

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    module Admin
+      # A command to notify users when a role is assigned for a Conference
+      class NotifyRoleAssignedToConference < Rectify::Command
+        def send_notification(user)
+          Decidim::EventsManager.publish(
+            event: "decidim.events.conferences.role_assigned",
+            event_class: Decidim::Conferences::ConferenceRoleAssignedEvent,
+            resource: form.current_participatory_space,
+            affected_users: [user],
+            extra: {
+              role: form.role
+            }
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -81,13 +81,20 @@ module Decidim
             location: form.location,
             start_date: form.start_date,
             end_date: form.end_date,
-            hero_image: form.hero_image,
-            banner_image: form.banner_image,
             promoted: form.promoted,
             scopes_enabled: form.scopes_enabled,
             scope: form.scope,
             show_statistics: form.show_statistics
-          }
+          }.merge(uploader_attributes)
+        end
+
+        def uploader_attributes
+          {
+            hero_image: form.hero_image,
+            remove_hero_image: form.remove_hero_image,
+            banner_image: form.banner_image,
+            remove_banner_image: form.remove_banner_image
+          }.delete_if { |_k, val| val.is_a?(Decidim::ApplicationUploader) }
         end
 
         def send_notification_registrations_enabled

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when updated a participatory
       # process admin in the system.
-      class UpdateConferenceAdmin < Rectify::Command
+      class UpdateConferenceAdmin < NotifyRoleAssignedToConference
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -45,6 +45,7 @@ module Decidim
             { role: form.role },
             log_info
           )
+          send_notification user_role.user
         end
       end
     end

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

@@ -0,0 +1,30 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Conferences
+    class ConferenceRoleAssignedEvent < Decidim::Events::SimpleEvent
+      include Decidim::Events::NotificationEvent
+      include Decidim::Events::AuthorEvent
+
+      def notification_title
+        I18n.t("notification_title", i18n_options).html_safe
+      end
+
+      def i18n_role
+        I18n.t(extra["role"], "decidim.admin.models.conference_user_role.roles", default: extra["role"])
+      end
+
+      def i18n_options
+        {
+          resource_path: resource_path,
+          resource_title: resource_title,
+          resource_url: resource_url,
+          scope: event_name,
+          participatory_space_title: participatory_space_title,
+          participatory_space_url: participatory_space_url,
+          role: i18n_role
+        }
+      end
+    end
+  end
+end

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

@@ -8,6 +8,7 @@ module Decidim
       #
       class ConferenceForm < Form
         include TranslatableAttributes
+        include Decidim::HasUploadValidations
 
         translatable_attribute :title, String
         translatable_attribute :slogan, String
@@ -45,13 +46,15 @@ module Decidim
         validates :registration_terms, translatable_presence: true, if: ->(form) { form.registrations_enabled? }
         validates :available_slots, numericality: { greater_than_or_equal_to: 0 }, if: ->(form) { form.registrations_enabled? }
 
-        validates :hero_image, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
-        validates :banner_image, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
+        validates :hero_image, passthru: { to: Decidim::Conference }
+        validates :banner_image, passthru: { to: Decidim::Conference }
         validate :available_slots_greater_than_or_equal_to_registrations_count, if: ->(form) { form.registrations_enabled? && form.available_slots.positive? }
 
         validates :start_date, presence: true, date: { before_or_equal_to: :end_date }
         validates :end_date, presence: true, date: { after_or_equal_to: :start_date }
 
+        alias organization current_organization
+
         def map_model(model)
           self.scope_id = model.decidim_scope_id
         end

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

@@ -26,7 +26,18 @@ module Decidim
         validates :full_name, presence: true, unless: proc { |object| object.existing_user }
         validates :user, presence: true, if: proc { |object| object.existing_user }
         validates :position, :affiliation, presence: true
-        validates :avatar, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_avatar_size } }
+        validates :avatar, passthru: {
+          to: Decidim::ConferenceSpeaker,
+          with: {
+            # The speaker gets its organization context through the conference
+            # object which is why we need to create a dummy conference in order
+            # to pass the correct organization context to the file upload
+            # validators.
+            conference: lambda do |form|
+              Decidim::Conference.new(organization: form.current_organization)
+            end
+          }
+        }
         validate :personal_url_format
 
         def personal_url

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

@@ -7,6 +7,8 @@ module Decidim
       # from the admin dashboard
       #
       class DiplomaForm < Form
+        include Decidim::HasUploadValidations
+
         mimic :conference
 
         attribute :main_logo
@@ -16,8 +18,10 @@ module Decidim
 
         validates :signature_name, :sign_date, :main_logo, :signature, presence: true
 
-        validates :main_logo, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
-        validates :signature, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
+        validates :main_logo, passthru: { to: Decidim::Conference }
+        validates :signature, passthru: { to: Decidim::Conference }
+
+        alias organization current_organization
       end
     end
   end

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

@@ -5,6 +5,8 @@ module Decidim
     module Admin
       # A form object used to create conference members from the admin dashboard.
       class PartnerForm < Form
+        include Decidim::HasUploadValidations
+
         mimic :conference_partner
 
         attribute :name, String
@@ -15,11 +17,24 @@ module Decidim
         attribute :remove_logo
 
         validates :name, :partner_type, presence: true, if: ->(form) { form.logo.present? }
-        validates :logo, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_avatar_size } }
+        validates :logo, passthru: {
+          to: Decidim::Conferences::Partner,
+          with: {
+            # The partner gets its organization context through the conference
+            # object which is why we need to create a dummy conference in order
+            # to pass the correct organization context to the file upload
+            # validators.
+            conference: lambda do |form|
+              Decidim::Conference.new(organization: form.current_organization)
+            end
+          }
+        }
         validate :link_format
         validates :weight, numericality: { greater_than_or_equal_to: 0 }
         validates :partner_type, inclusion: { in: Decidim::Conferences::Partner::TYPES }
 
+        alias organization current_organization
+
         def link
           return if super.blank?
 

data/app/jobs/decidim/conferences/admin/send_conference_diploma_job.rb

@@ -11,7 +11,7 @@ module Decidim
           return unless confirmed_registrations.any?
 
           confirmed_registrations.each do |registration_confirmed|
-            SendConferenceDiplomaMailer.diploma(conference, registration_confirmed.user).deliver_now
+            SendConferenceDiplomaMailer.diploma(conference, registration_confirmed.user).deliver_later
           end
         end
       end