decidim-conferences 0.24.0 → 0.25.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63870df7617bd7fe13c574112151fe136309a33a8cc4882f626a40a62bb2c30f
-  data.tar.gz: c555b68cac5290d1d4136aa51438825943f1b88bbfd6cbd21429f710059349dc
+  metadata.gz: f6dfe0337e8c9b03cfede5fd6d6469602bf88806d7c40856e1ccd64f64070d9e
+  data.tar.gz: 631467264ba1d1bb15f7c655d9fff08d7983e8d643a8a96730f565b087630016
 SHA512:
-  metadata.gz: 121f61ddd38094a32f5039ea1b0e07237c4db258979fb3ea008460049d2ca1a37978315caa129a5c2229f46d005f7109bb1ca10b6c225b7fb3d0d1c37ddace07
-  data.tar.gz: f1bf3b9618635761ad8f550e05e740683b32e282f637105a47cb5779e1e94f959736fee322ddb2df8cb5697c0f396646921bd46218387ac9ace9d7f105f01932
+  metadata.gz: 57bf10bcbec221fe8a639db9fbc2e82ebe86e7c72918ece5b365968395454d773513e8b6c8da04da539868e9ab8846acf33fb58ed37a19045c85c10bd539ff7e
+  data.tar.gz: 858a670a30b20b4aa3132f5f8a81de55bd29c83c8542ad87c3d314180db1f2cf001184ad56fe3b23491472c2a9d8b01445760032b27655a87b2e48f99b75848b

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

@@ -27,7 +27,7 @@ module Decidim
       end
 
       def resource_image_path
-        model.hero_image.url
+        model.attached_uploader(:hero_image).path
       end
 
       def statuses

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, alt: "speaker-image" %>
+      <%= image_tag avatar_path, 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, alt: "speaker-image" %>
+            <%= image_tag avatar_path, alt: "speaker-image" %>
           </div>
         </div>
         <div class="speaker-data">

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

@@ -39,10 +39,10 @@ module Decidim
         speakers.map { |speaker| present(speaker) }
       end
 
-      def avatar
-        return model.user.avatar if model.user.present?
+      def avatar_path
+        return Decidim::UserPresenter.new(model.user).avatar_url if model.user.present?
 
-        model.avatar
+        model.attached_uploader(:avatar).path
       end
 
       def has_profile?

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

@@ -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.hero_image.url %>)"></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/partner_cell.rb

@@ -17,9 +17,9 @@ module Decidim
       end
 
       def logo
-        return unless model.logo.presence
+        return unless model.logo.attached?
 
-        "<div class='card p-m flex--cc'> #{image_tag model.logo.medium.url, alt: "logo"} </div>"
+        "<div class='card p-m flex--cc'> #{image_tag model.attached_uploader(:logo).path(variant: :medium), alt: "logo"} </div>"
       end
     end
   end

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

@@ -26,6 +26,7 @@ module Decidim
 
           Conference.transaction do
             copy_conference
+            copy_conference_attachments
             copy_conference_categories if @form.copy_categories?
             copy_conference_components if @form.copy_components?
           end
@@ -47,8 +48,6 @@ module Decidim
             description: @conference.description,
             short_description: @conference.short_description,
             location: @conference.location,
-            hero_image: @conference.hero_image,
-            banner_image: @conference.banner_image,
             promoted: @conference.promoted,
             scopes_enabled: @conference.scopes_enabled,
             scope: @conference.scope,
@@ -58,6 +57,14 @@ module Decidim
           )
         end
 
+        def copy_conference_attachments
+          [:hero_image, :banner_image].each do |attribute|
+            next unless @conference.attached_uploader(attribute).attached?
+
+            @copied_conference.send(attribute).attach(@conference.send(attribute).blob)
+          end
+        end
+
         def copy_conference_categories
           @conference.categories.each do |category|
             category_copied = category.dup

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

@@ -6,6 +6,8 @@ module Decidim
       # A command with all the business logic when creating a new conference
       # speaker in the system.
       class CreateConferenceSpeaker < Rectify::Command
+        include ::Decidim::AttachmentAttributesMethods
+
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -55,8 +57,6 @@ module Decidim
             :full_name,
             :twitter_handle,
             :personal_url,
-            :avatar,
-            :remove_avatar,
             :position,
             :affiliation,
             :short_bio
@@ -64,6 +64,8 @@ module Decidim
             decidim_conference_id: conference.id,
             conference: conference,
             user: form.user
+          ).merge(
+            attachment_attributes(:avatar)
           )
           conference_speaker = conference.speakers.build
           conference_speaker.conference = conference

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

@@ -6,6 +6,8 @@ module Decidim
       # A command with all the business logic when creating a new participatory
       # conference in the system.
       class UpdateConference < Rectify::Command
+        include ::Decidim::AttachmentAttributesMethods
+
         # Public: Initializes the command.
         #
         # conference - the Conference to update
@@ -85,16 +87,9 @@ module Decidim
             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) }
+          }.merge(
+            attachment_attributes(:hero_image, :banner_image)
+          )
         end
 
         def send_notification_registrations_enabled

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

@@ -6,12 +6,13 @@ module Decidim
       # A command with all the business logic when updating a conference
       # speaker in the system.
       class UpdateConferenceSpeaker < Rectify::Command
+        include ::Decidim::AttachmentAttributesMethods
+
         # Public: Initializes the command.
         #
         # 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
@@ -62,14 +63,9 @@ module Decidim
             :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) }
+          ).merge(
+            attachment_attributes(:avatar)
+          )
         end
 
         def update_conference_speaker!

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

@@ -35,8 +35,8 @@ module Decidim
         attr_reader :form, :conference
 
         def update_conference_diploma
-          @conference.main_logo = @form.main_logo
-          @conference.signature = @form.signature
+          @conference.main_logo = @form.main_logo if @form.main_logo.present?
+          @conference.signature = @form.signature if @form.signature.present?
           @conference.signature_name = @form.signature_name
           @conference.sign_date = @form.sign_date
 

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

@@ -6,13 +6,13 @@ module Decidim
       # A command with all the business logic when updating a conference
       # partner in the system.
       class UpdatePartner < Rectify::Command
+        include ::Decidim::AttachmentAttributesMethods
+
         # Public: Initializes the command.
         #
         # 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
@@ -54,9 +54,9 @@ module Decidim
             :name,
             :weight,
             :partner_type,
-            :link,
-            :logo,
-            :remove_logo
+            :link
+          ).merge(
+            attachment_attributes(:logo)
           )
         end
 

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Conferences
     module Admin

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/admin/application_controller"
-
 module Decidim
   module Conferences
     module Admin

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

@@ -41,9 +41,9 @@ module Decidim
         end
 
         def edit
-          @conference_speaker = collection.find(params[:id])
-          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

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

@@ -82,11 +82,7 @@ module Decidim
         end
 
         def conference_params
-          {
-            id: params[:slug],
-            hero_image: current_conference.hero_image,
-            banner_image: current_conference.banner_image
-          }.merge(params[:conference].to_unsafe_h)
+          { id: params[:slug] }.merge(params[:conference].to_unsafe_h)
         end
       end
     end

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

@@ -16,7 +16,7 @@ module Decidim
         def update
           enforce_permission_to :update, :conference, conference: current_conference
 
-          @form = form(DiplomaForm).from_params(diploma_params).with_context(conference: current_conference)
+          @form = form(DiplomaForm).from_params(diploma_params).with_context(conference: current_conference, current_organization: current_organization)
 
           UpdateDiploma.call(@form, current_conference) do
             on(:ok) do
@@ -51,9 +51,7 @@ module Decidim
 
         def diploma_params
           {
-            id: params[:slug],
-            signature: current_conference.signature,
-            main_logo: current_conference.main_logo
+            id: params[:slug]
           }.merge(params[:conference].to_unsafe_h)
         end
       end

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

@@ -25,9 +25,9 @@ module Decidim
         attribute :scopes_enabled, Boolean
         attribute :scope_id, Integer
         attribute :hero_image
-        attribute :remove_hero_image
+        attribute :remove_hero_image, Boolean, default: false
         attribute :banner_image
-        attribute :remove_banner_image
+        attribute :remove_banner_image, Boolean, default: false
         attribute :show_statistics, Boolean
         attribute :start_date, Decidim::Attributes::LocalizedDate
         attribute :end_date, Decidim::Attributes::LocalizedDate
@@ -43,12 +43,13 @@ module Decidim
 
         validate :slug_uniqueness
 
+        validates :available_slots, presence: true, if: ->(form) { form.registrations_enabled? }
+        validates :available_slots, numericality: { greater_than_or_equal_to: 0 }, if: ->(form) { form.registrations_enabled? && form.available_slots.present? }
         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, 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? }
+        validate :available_slots_greater_than_or_equal_to_registrations_count, if: ->(form) { form.registrations_enabled? && form.available_slots.try(: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 }

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

@@ -18,7 +18,7 @@ module Decidim
         attribute :twitter_handle, String
         attribute :personal_url, String
         attribute :avatar
-        attribute :remove_avatar
+        attribute :remove_avatar, Boolean, default: false
         attribute :user_id, Integer
         attribute :existing_user, Boolean, default: false
         attribute :conference_meeting_ids, Array[Integer]

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

@@ -14,10 +14,10 @@ module Decidim
         attribute :partner_type, String
         attribute :weight, Integer, default: 0
         attribute :logo
-        attribute :remove_logo
+        attribute :remove_logo, Boolean, default: false
 
         validates :name, :partner_type, presence: true, if: ->(form) { form.logo.present? }
-        validates :logo, presence: true, unless: ->(form) { form.logo.present? }
+        validates :logo, presence: true, unless: :persisted?
         validates :logo, passthru: {
           to: Decidim::Conferences::Partner,
           with: {

data/app/models/decidim/conference.rb

@@ -55,17 +55,17 @@ module Decidim
     validates :slug, uniqueness: { scope: :organization }
     validates :slug, presence: true, format: { with: Decidim::Conference.slug_format }
 
-    validates_upload :hero_image
-    mount_uploader :hero_image, Decidim::HeroImageUploader
+    has_one_attached :hero_image
+    validates_upload :hero_image, uploader: Decidim::HeroImageUploader
 
-    validates_upload :banner_image
-    mount_uploader :banner_image, Decidim::HomepageImageUploader
+    has_one_attached :banner_image
+    validates_upload :banner_image, uploader: Decidim::HomepageImageUploader
 
-    validates_upload :main_logo
-    mount_uploader :main_logo, Decidim::Conferences::DiplomaUploader
+    has_one_attached :main_logo
+    validates_upload :main_logo, uploader: Decidim::Conferences::DiplomaUploader
 
-    validates_upload :signature
-    mount_uploader :signature, Decidim::Conferences::DiplomaUploader
+    has_one_attached :signature
+    validates_upload :signature, uploader: Decidim::Conferences::DiplomaUploader
 
     searchable_fields({
                         scope_id: :decidim_scope_id,

data/app/models/decidim/conference_speaker.rb

@@ -18,8 +18,8 @@ module Decidim
 
     default_scope { order(full_name: :asc, created_at: :asc) }
 
-    validates_avatar
-    mount_uploader :avatar, Decidim::AvatarUploader
+    has_one_attached :avatar
+    validates_avatar :avatar, uploader: Decidim::AvatarUploader
 
     delegate :organization, to: :conference
 

data/app/models/decidim/conferences/partner.rb

@@ -14,8 +14,8 @@ module Decidim
 
       default_scope { order(partner_type: :desc, weight: :asc) }
 
-      validates_avatar :logo
-      mount_uploader :logo, Decidim::Conferences::PartnerLogoUploader
+      has_one_attached :logo
+      validates_avatar :logo, uploader: Decidim::Conferences::PartnerLogoUploader
 
       delegate :organization, to: :conference
 

data/app/packs/entrypoints/decidim_conferences_admin.js

@@ -0,0 +1,7 @@
+import "src/decidim/conferences/admin/conferences"
+import "src/decidim/conferences/admin/conference_speakers"
+import "src/decidim/conferences/admin/conference_invite_form"
+import "src/decidim/slug_form"
+
+// Images
+require.context("../images", true)

data/app/{assets/javascripts/decidim/conferences/admin/conference_invite_form.es6 → packs/src/decidim/conferences/admin/conference_invite_form.js}

@@ -1,6 +1,6 @@
-((exports) => {
-  const { createFieldDependentInputs } = exports.DecidimAdmin;
+import createFieldDependentInputs from "src/decidim/admin/field_dependent_inputs.component"
 
+$(() => {
   const $attendeeType = $('[name="conference_registration_invite[existing_user]"');
 
   createFieldDependentInputs({
@@ -22,4 +22,4 @@
       return $("#conference_registration_invite_existing_user_true").is(":checked")
     }
   });
-})(window);
+})

data/app/{assets/javascripts/decidim/conferences/admin/conference_speakers.js.es6 → packs/src/decidim/conferences/admin/conference_speakers.js}

@@ -1,6 +1,6 @@
-((exports) => {
-  const { createFieldDependentInputs } = exports.DecidimAdmin;
+import createFieldDependentInputs from "src/decidim/admin/field_dependent_inputs.component"
 
+$(() => {
   const $conferenceSpeakerType = $("#conference_speaker_existing_user");
 
   createFieldDependentInputs({
@@ -23,4 +23,4 @@
     }
   });
 
-})(window);
+})