decidim-conferences 0.22.0 → 0.23.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e927274e7911f8f49d468aa0d0102712d9271549757ff974f97b65dee4f12800
-  data.tar.gz: f0a57fd51a3fcec014bd6dbb1ddedf1a646d7bd25a9d726248e1de5f254c9914
+  metadata.gz: 76e05e50396ac0d639819e9355e1dd1c08519aabeed44643ae6b20f116e1539e
+  data.tar.gz: 052d02f80f30d28808ce7b9c3b3017f418ffb49b5d969deec9c75becc93a0bbe
 SHA512:
-  metadata.gz: 1fe6c3aea3cd56b87ff3771cb04965d3473f70553fbbef087dcacc7adbe097c3c7fa8501a79b390c29d81ae7781b3b1e3f511e9582ff08cf508d22ff1ac65455
-  data.tar.gz: b3f935e675ed4cc6ab24b81243b4b157ca238f57a0eb7674db1e1e44dcc55aa789f341454cb0278a81acae1aef1476024651aa613d63e8a25e48c0b46c13c64c
+  metadata.gz: f98072cd1897a9e4c5e824665c0d39fe7745ec41a88bf85239babd0510d4f51da2e416170ef9b3930941c03d827d53cf7a91a90428b3cff11b480ca74f9bdd5d
+  data.tar.gz: a1868c81d78d0407e67a0ca4fabaf60cc2102f50490b63cb3945f77d3e69f1a8ea552071cd827a093e253fe43e406d81c18de7167f67679892241eb1a0f55a44

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/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_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/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/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/models/decidim/conference.rb

@@ -10,13 +10,17 @@ module Decidim
     include Decidim::HasAttachmentCollections
     include Decidim::Participable
     include Decidim::Publicable
-    include Decidim::Scopable
+    include Decidim::ScopableParticipatorySpace
     include Decidim::Followable
     include Decidim::HasReference
     include Decidim::Traceable
     include Decidim::Loggable
     include Decidim::ParticipatorySpaceResourceable
     include Decidim::Searchable
+    include Decidim::HasUploadValidations
+    include Decidim::TranslatableResource
+
+    translatable_fields :title, :slogan, :short_description, :description, :objectives, :registration_terms
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
@@ -51,9 +55,16 @@ 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
+
+    validates_upload :banner_image
     mount_uploader :banner_image, Decidim::HomepageImageUploader
+
+    validates_upload :main_logo
     mount_uploader :main_logo, Decidim::Conferences::DiplomaUploader
+
+    validates_upload :signature
     mount_uploader :signature, Decidim::Conferences::DiplomaUploader
 
     searchable_fields({
@@ -124,6 +135,10 @@ module Decidim
       roles.where(role: role_name)
     end
 
+    def attachment_context
+      :admin
+    end
+
     # Allow ransacker to search for a key in a hstore column (`title`.`en`)
     ransacker :title do |parent|
       Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))

data/app/models/decidim/conference_speaker.rb

@@ -6,16 +6,19 @@ module Decidim
   class ConferenceSpeaker < ApplicationRecord
     include Decidim::Traceable
     include Decidim::Loggable
+    include Decidim::HasUploadValidations
+    include Decidim::TranslatableResource
+
+    translatable_fields :position, :affiliation, :short_bio
 
     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"
 
-    validates :avatar, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_avatar_size } }
-
     default_scope { order(full_name: :asc, created_at: :asc) }
 
+    validates_avatar
     mount_uploader :avatar, Decidim::AvatarUploader
 
     delegate :organization, to: :conference

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

@@ -6,6 +6,9 @@ module Decidim
     class MediaLink < ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::TranslatableResource
+
+      translatable_fields :title
 
       belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
 

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

@@ -6,15 +6,19 @@ module Decidim
     class Partner < ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::HasUploadValidations
 
       TYPES = %w(main_promotor collaborator).freeze
 
       belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
-      validates :logo, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_avatar_size } }
 
       default_scope { order(partner_type: :desc, weight: :asc) }
+
+      validates_avatar :logo
       mount_uploader :logo, Decidim::Conferences::PartnerLogoUploader
 
+      delegate :organization, to: :conference
+
       alias participatory_space conference
 
       def self.log_presenter_class_for(_log)

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

@@ -7,6 +7,9 @@ module Decidim
       include Decidim::Publicable
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::TranslatableResource
+
+      translatable_fields :title, :description
 
       belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
       has_many :conference_meeting_registration_types, dependent: :destroy

data/app/presenters/decidim/conferences/admin_log/{conferences_presenter.rb → conference_presenter.rb}

@@ -48,8 +48,8 @@ module Decidim
           end
         end
 
-        def has_diff?
-          action == "unpublish" || super
+        def diff_actions
+          super + %w(unpublish)
         end
       end
     end

data/app/presenters/decidim/conferences/admin_log/conference_registration_presenter.rb

@@ -34,8 +34,8 @@ module Decidim
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

data/app/presenters/decidim/conferences/admin_log/conference_speaker_presenter.rb

@@ -43,8 +43,8 @@ module Decidim
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

data/app/presenters/decidim/conferences/admin_log/{conferences_user_role_presenter.rb → conference_user_role_presenter.rb}

@@ -44,8 +44,8 @@ module Decidim
           ).changeset
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

data/app/presenters/decidim/conferences/admin_log/media_link_presenter.rb

@@ -36,8 +36,8 @@ module Decidim
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

data/app/presenters/decidim/conferences/admin_log/partner_presenter.rb

@@ -38,8 +38,8 @@ module Decidim
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

data/app/presenters/decidim/conferences/admin_log/registration_type_presenter.rb

@@ -36,8 +36,8 @@ module Decidim
           end
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
       end
     end

data/app/views/decidim/conferences/registration_types/index.html.erb

@@ -23,7 +23,7 @@ edit_link(
           <%= cell "decidim/conferences/registration_type", registration_type, allowed: allowed_to?(:join, :conference, conference: current_participatory_space) %>
         <% end %>
       <% else %>
-        No registrations
+        <%= t("registration_types.index.no_registrations", scope: "decidim.conferences") %>
       <% end %>
     </section>
   </div>

data/app/views/layouts/decidim/conference.html.erb

@@ -8,6 +8,7 @@
 <%= render "layouts/decidim/application" do %>
   <%= render partial: "layouts/decidim/conference_hero" %>
   <%= render partial: "layouts/decidim/conferences_nav" %>
+  <%= cell "decidim/translation_bar", current_organization %>
   <div class="wrapper">
     <%= yield %>
   </div>

data/config/locales/am-ET.yml

@@ -0,0 +1 @@
+am:

data/config/locales/bg.yml

@@ -0,0 +1,7 @@
+bg:
+  activemodel:
+    attributes:
+      conference:
+        assemblies_ids: Свързани събрания
+        banner_image: Банер изображение
+        consultations_ids: Свързани консултации

data/config/locales/ca.yml

@@ -475,6 +475,7 @@ ca:
         index:
           choose_an_option: 'Tria el teu tipus d''inscripció:'
           login_as: Has iniciat la sessió com a %{name} <%{email}>
+          no_registrations: Sense insripcions
           register: Inscriu-te
           title: Tipus d'inscripció
       shared:

data/config/locales/cs.yml

@@ -8,18 +8,18 @@ cs:
         copy_categories: Kopírovat kategorie
         copy_components: Kopírování komponent
         copy_features: Funkce kopírování
-        decidim_scope_id: Rozsah
+        decidim_scope_id: Oblast působnosti
         description: Popis
         hashtag: Hashtag
         hero_image: Obrázek na hlavní stránce
         participatory_processes_ids: Související procesy účasti
         promoted: Propagováno
         published_at: Publikováno v
-        scope_id: Rozsah
-        scopes_enabled: Schopnosti povoleny
+        scope_id: Oblast působnosti
+        scopes_enabled: Oblasti působnosti povoleny
         short_description: Stručný popis
         show_statistics: Zobrazit statistiky
-        slogan: Heslo
+        slogan: Motto
         slug: URL slug
         title: Titul
       conference_speaker:
@@ -76,9 +76,9 @@ cs:
       conference_speakers:
         create:
           error: Při přidání řečníka k této konferenci došlo k chybě.
-          success: Přednášející byl úspěšně vytvořen pro tuto konferenci.
+          success: Řečník byl úspěšně vytvořen pro tuto konferenci.
         destroy:
-          success: Reproduktor byl úspěšně smazán pro tuto konferenci.
+          success: Řečník byl úspěšně smazán pro tuto konferenci.
         edit:
           title: Aktualizovat řečníka konference.
           update: Aktualizace
@@ -89,7 +89,7 @@ cs:
           title: Nový řečník konference.
         update:
           error: Při této konferenci došlo k chybě při aktualizaci řečníka.
-          success: Speaker se úspěšně pro tuto konferenci úspěšně aktualizoval.
+          success: Řečník konference byl úspěšně aktualizován.
       conference_user_roles:
         create:
           error: Při přidávání administrátora této konference došlo k chybě.
@@ -143,10 +143,10 @@ cs:
           media_links_title: Odkazy na média
         new:
           create: Vytvořit
-          title: Odkaz na media
+          title: Odkaz na média
         update:
           error: Při aktualizaci tohoto odkazu na média došlo k chybě.
-          success: Media Link byl úspěšně aktualizován.
+          success: Odkaz na média byl úspěšně aktualizován.
       menu:
         conferences: Konference
         conferences_submenu:
@@ -195,7 +195,7 @@ cs:
             date: datum
             link: Odkaz
             title: Název
-          name: Media Link
+          name: Odkaz na média
         partner:
           fields:
             link: Odkaz
@@ -212,7 +212,7 @@ cs:
             price: Cena
             registrations_count: Registrace se počítají
             title: Název
-            weight: Hmotnost
+            weight: Váha
           name: Typ registrace
       partners:
         create:
@@ -263,7 +263,7 @@ cs:
         update_diploma: "%{user_name} aktualizovala certifikáty pro účast na %{resource_name} konferenci"
       conference_speaker:
         create: "%{user_name} vytvořil %{resource_name} řečníka na konferenci %{space_name}"
-        delete: "%{user_name} odstranila %{resource_name} reproduktor z %{space_name} konferencí"
+        delete: "%{user_name} odstranil řečníka %{resource_name} z konference %{space_name}"
         update: "%{user_name} aktualizoval %{resource_name} řečníka na konferenci %{space_name}"
       conference_user_role:
         create: "%{user_name} pozval %{resource_name} na konferenci %{space_name}"
@@ -282,9 +282,9 @@ cs:
           unpublish: "%{user_name} nepublikováno %{resource_name} typ registrace na %{space_name} konferencích"
           update: "%{user_name} aktualizoval typ registrace %{resource_name} na konferenci %{space_name}"
       media_link:
-        create: "%{user_name} vytvořilo %{resource_name} mediální odkaz na konferenci %{space_name}"
-        delete: "%{user_name} odstranilo %{resource_name} odkaz na média z %{space_name} konferencí"
-        update: "%{user_name} aktualizovalo %{resource_name} odkaz na média v %{space_name} konferenci"
+        create: "%{user_name} vytvořil %{resource_name} odkaz na média v konferenci %{space_name}"
+        delete: "%{user_name} odstranil %{resource_name} odkaz na média z konference %{space_name}"
+        update: "%{user_name} aktualizoval %{resource_name} odkaz na média v konferenci %{space_name}"
     conference_program:
       index:
         title: Program
@@ -380,7 +380,7 @@ cs:
         program_meeting:
           content: Obsah
           location: Umístění
-          speakers: Reproduktory
+          speakers: Řečníci
           streaming: Streamování
         show:
           day: Den
@@ -388,11 +388,11 @@ cs:
       conference_registration_mailer:
         confirmation:
           confirmed_html: Vaše registrace pro konferenci <a href="%{url}">%{title}</a> byla potvrzena.
-          details_1: 'Jste přihlášeni do konference s typem %{registration_type}. Má cenu %{price} a můžete se zúčastnit následujících akcí:'
+          details_1: 'Jste přihlášeni do konference s typem %{registration_type}. Stojí %{price} a můžete se zúčastnit následujících akcí:'
           details_2: Podrobnosti o konferenci naleznete v příloze.
         pending_validation:
           confirmation_pending: Potvrzení obdržíte brzy
-          details: 'Zaregistrovali jste se na typ %{registration_type} s cenou %{price} a můžete se zúčastnit následujících událostí:'
+          details: 'Zaregistrovali jste se na typ konference %{registration_type} s cenou %{price} a můžete se zúčastnit následujících událostí:'
           pending_html: Vaše registrace pro konferenci <a href="%{url}">%{title}</a> čeká na potvrzení.
       conference_registrations:
         create:
@@ -417,7 +417,7 @@ cs:
           go_to_twitter: Přejděte na Twitter
       conference_speakers:
         index:
-          speakers: Reproduktory
+          speakers: Řečníci
       conferences:
         partners:
           collaborators: Partneři
@@ -460,7 +460,7 @@ cs:
             email: E-mail
             name: název
             registration_type: Typ registrace
-            state: Stát
+            state: Stav
             states:
               confirmed: Potvrzeno
               pending: čekající
@@ -483,6 +483,7 @@ cs:
         index:
           choose_an_option: 'Vyberte možnost registrace:'
           login_as: Jste přihlášeni jako %{name} <%{email}>
+          no_registrations: Žádné registrace
           register: Registrovat
           title: Typy registrace
       shared:
@@ -585,6 +586,6 @@ cs:
       conferences_nav:
         conference_menu_item: Informace
         conference_partners_menu_item: Partneři
-        conference_speaker_menu_item: Reproduktory
+        conference_speaker_menu_item: Řečníci
         media: Média
         venues: Místa