decidim-conferences 0.20.0 → 0.23.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fe396d63f9e335c79c6ef5d3c2e7220226e03e6797e184cb60a681b30c79d6b
-  data.tar.gz: 8ee8b6a31e1f5f2cccc59de336da8f8f62f4943c8144d9571243727dbeff4300
+  metadata.gz: 6d9a83482ea527bcdb77d7ec545122720864b72d3e3287e4ed6c4f2af3cc374a
+  data.tar.gz: e40f35304651a5a310652cfe748223ba411eda727b53a30bc0b03b78901360ec
 SHA512:
-  metadata.gz: dee2e08fa8880ee4c54af3b7da1291adde063e006377b0472481cc515396eb632f8bb78667e714ce0062a99c74a1d7f0d9a7afaac8ce62a129588ce8af4287cd
-  data.tar.gz: 6dbb9a34018713b7d5d19891a03f5a7e5cd32dc2f1deb219828ec1c502e14197be5499b9c61947f707008d09f8be70554c5de207fc6361c48ab0c3edcdf70a5a
+  metadata.gz: cecade8d5fe14ad8ac030a273a3b1a094dc45fc47e5b686d0676de69e1c9ee6a8cc190a11c264c91e034455f09dc12b19c531d8077b38b9dba9f2a6ada28df36
+  data.tar.gz: 66ea854a0efe0a70803c929aecaa6c9a4949b4966a4a3b2156c946f78868eb360a303e4eef2d6db95b493a591ec6e88ca24cec23458b9a1056ac318f9c8307a5

data/README.md

@@ -27,6 +27,8 @@ And then execute:
 
 ```bash
 bundle
+bundle exec rails decidim_conferences:install:migrations
+bundle exec rails db:migrate
 ```
 
 ## Contributing

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

@@ -85,7 +85,7 @@ module Decidim
         end
 
         def link_participatory_processes
-          conference.link_participatory_spaces_resources(participatory_processes, "included_participatory_processes")
+          conference.link_participatory_space_resources(participatory_processes, "included_participatory_processes")
         end
 
         def assemblies
@@ -93,7 +93,7 @@ module Decidim
         end
 
         def link_assemblies
-          conference.link_participatory_spaces_resources(assemblies, "included_assemblies")
+          conference.link_participatory_space_resources(assemblies, "included_assemblies")
         end
 
         def consultations
@@ -102,7 +102,7 @@ module Decidim
         end
 
         def link_consultations
-          conference.link_participatory_spaces_resources(consultations, "included_consultations")
+          conference.link_participatory_space_resources(consultations, "included_consultations")
         end
       end
     end

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
@@ -140,7 +147,7 @@ module Decidim
         end
 
         def link_participatory_processes
-          @conference.link_participatory_spaces_resources(participatory_processes, "included_participatory_processes")
+          @conference.link_participatory_space_resources(participatory_processes, "included_participatory_processes")
         end
 
         def assemblies
@@ -148,7 +155,7 @@ module Decidim
         end
 
         def link_assemblies
-          @conference.link_participatory_spaces_resources(assemblies, "included_assemblies")
+          @conference.link_participatory_space_resources(assemblies, "included_assemblies")
         end
 
         def consultations
@@ -157,7 +164,7 @@ module Decidim
         end
 
         def link_consultations
-          @conference.link_participatory_spaces_resources(consultations, "included_consultations")
+          @conference.link_participatory_space_resources(consultations, "included_consultations")
         end
       end
     end

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/controllers/concerns/decidim/conferences/admin/filterable.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Conferences
+    module Admin
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          private
+
+          def base_query
+            collection
+          end
+
+          def filters
+            [:published_at_null]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,11 +8,11 @@ module Decidim
       class ConferencesController < Decidim::Conferences::Admin::ApplicationController
         helper_method :current_conference, :current_participatory_space
         layout "decidim/admin/conferences"
-        include Decidim::Paginable
+        include Decidim::Conferences::Admin::Filterable
 
         def index
           enforce_permission_to :read, :conference_list
-          @conferences = paginate(collection)
+          @conferences = filtered_collection
         end
 
         def new
@@ -70,9 +70,8 @@ module Decidim
         private
 
         def current_conference
-          scope = OrganizationConferences.new(current_user.organization).query
-          @current_conference ||= scope.where(slug: params[:slug]).or(
-            scope.where(id: params[:slug])
+          @current_conference ||= collection.where(slug: params[:slug]).or(
+            collection.where(id: params[:slug])
           ).first
         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