decidim-conferences 0.18.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41bc0fa1704dd82d8cbcb8773eb1a78133f74bb2bb2cbba68e40a9b8c13bb272
-  data.tar.gz: bbee0a2a4056e90c206a1d4654881a198672de960f455f18f93fb363da796687
+  metadata.gz: 99821cad74f86b23d2243a063e9c5f347aff5a1c8e284e8c8c0cc250c726da59
+  data.tar.gz: 681fd61ed392ae35e2f580fac6e6ff49e6fad73f90e2e87585a5e343042ef73b
 SHA512:
-  metadata.gz: f1191337a66f032b2dab9a6cbb2af64fc2a36ef663a365820efdec4a648e2bcc2596ec15196ca2b949dd258e2eb15bde180b5923655c6132f4a03ec9a3b6d7e8
-  data.tar.gz: 7fc54160090e4aa6fe2a4b41a028af34174d200a4be356ec264a7d2396ab919c579bc6410d284fdbc4b040c33055b7421ff7dc877c2e5303721ce2ef7183d58f
+  metadata.gz: dd9b00dae882f1a7e7aba6aced3e95ae4812abc5e7f81e2abf3f10cfa425a26cea3b6fef3c706ceae59cca30008e86c1fc505130b963668c888b13eecf8af285
+  data.tar.gz: 4ad9c3cfa57db46f38e22da1310323249f955d6c2f95b467ba62cbc184a7db7ff6b74e4bd60eec1bc75346f05bbf744674d2e8dbc07b2c1559e9d93559d78c84

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/stylesheet/decidim/conferences/conferences.scss

@@ -0,0 +1,3 @@
+.conference--date{
+  cursor: default;
+}

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

@@ -1,7 +1,7 @@
 <div class="mb-s">
   <% if model.respond_to? :location %>
     <div>
-      <strong><%= translated_attribute model.location %></strong><br />
+      <strong><%= translated_attribute model.location %></strong><br>
     </div>
   <% end %>
   <div class="text-medium"><%= model.address %></div>

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

@@ -67,14 +67,14 @@
       <% end %>
     </div>
     <% if meetings.present? %>
-      <hr class="reset mt-none mb-s" />
+      <hr class="reset mt-none mb-s">
       <div class="row">
         <div class="column medium-12">
           <div class="bio-acts">Speaking at</div>
 
           <ul class="list-reset">
             <% meetings.each do |meeting| %>
-              <%= meeting_title meeting %> <br />
+              <%= meeting_title meeting %> <br>
             <% end %>
           </ul>
         </div>

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

@@ -41,6 +41,7 @@ module Decidim
 
       def avatar
         return model.user.avatar if model.user.present?
+
         model.avatar
       end
 
@@ -58,17 +59,20 @@ module Decidim
 
       def short_bio
         return unless model.short_bio.presence
+
         translated_attribute model.short_bio
       end
 
       def twitter_handle
         return unless model.twitter_handle.presence
-        link_to t(".go_to_twitter"), "https://twitter.com/#{model.twitter_handle}", target: "_blank"
+
+        link_to t(".go_to_twitter"), "https://twitter.com/#{model.twitter_handle}", target: "_blank", rel: "noopener"
       end
 
       def personal_url
         return unless model.personal_url.presence || (model.user.presence && model.user.personal_url.presence)
-        link_to model.personal_url || model.user.personal_url, target: "_blank", class: "card-link" do
+
+        link_to model.personal_url || model.user.personal_url, target: "_blank", class: "card-link", rel: "noopener" do
           "#{icon "external-link"}" " #{t(".personal_website")}"
         end
       end

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

@@ -20,22 +20,28 @@ module Decidim
 
       def conference_participatory_processes
         return unless Decidim.participatory_space_manifests.map(&:name).include?(:participatory_processes)
+
         processes = model.linked_participatory_space_resources(:participatory_processes, "included_participatory_processes")
         return unless processes.any?
+
         processes
       end
 
       def conference_assemblies
         return unless Decidim.participatory_space_manifests.map(&:name).include?(:assemblies)
+
         assemblies = model.linked_participatory_space_resources(:assemblies, "included_assemblies")
         return unless assemblies.any?
+
         assemblies
       end
 
       def conference_consultations
         return unless Decidim.participatory_space_manifests.map(&:name).include?(:consultations)
+
         consultations = model.linked_participatory_space_resources(:consultations, "included_consultations")
         return unless consultations.any?
+
         consultations
       end
 

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

@@ -12,11 +12,13 @@ module Decidim
 
       def name
         return unless model.name.presence
+
         "<div class='text-medium'> #{model.name} </div>"
       end
 
       def logo
         return unless model.logo.presence
+
         "<div class='card p-m flex--cc'> #{image_tag model.logo.medium.url} </div>"
       end
     end

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

@@ -10,6 +10,7 @@ module Decidim
 
       def show
         return unless model.any?
+
         render
       end
     end

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

@@ -27,6 +27,7 @@ module Decidim
 
       def price
         return I18n.t("free", scope: "decidim.conferences.conference.show") if model.price.blank?
+
         number_to_currency(model.price, locale: I18n.locale, unit: Decidim.currency_unit)
       end
 
@@ -44,6 +45,7 @@ module Decidim
 
       def i18n_join_text
         return I18n.t("registration", scope: "decidim.conferences.conference.show") if conference.has_available_slots?
+
         I18n.t("no_slots_available", scope: "decidim.conferences.conference.show")
       end
     end

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

@@ -20,6 +20,7 @@ module Decidim
         def call
           @conference_registration.with_lock do
             return broadcast(:invalid) unless can_join_conference?
+
             confirm_registration
             send_email_confirmation
             send_notification_confirmation

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

@@ -29,7 +29,6 @@ module Decidim
             link_consultations
 
             broadcast(:ok, conference)
-            send_notification
           else
             form.errors.add(:hero_image, conference.errors[:hero_image]) if conference.errors.include? :hero_image
             form.errors.add(:banner_image, conference.errors[:banner_image]) if conference.errors.include? :banner_image
@@ -81,21 +80,12 @@ module Decidim
           end
         end
 
-        def send_notification
-          Decidim::EventsManager.publish(
-            event: "decidim.events.conferences.registrations_enabled",
-            event_class: Decidim::Conferences::ConferenceRegistrationsEnabledEvent,
-            resource: conference,
-            followers: conference.followers
-          )
-        end
-
         def participatory_processes
           @participatory_processes ||= conference.participatory_space_sibling_scope(:participatory_processes).where(id: @form.participatory_processes_ids)
         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
@@ -103,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
@@ -112,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

@@ -91,6 +91,7 @@ module Decidim
 
         def invitation_instructions
           return "invite_admin" if form.role == "admin"
+
           "invite_collaborator"
         end
 

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

@@ -28,11 +28,23 @@ module Decidim
           end
 
           broadcast(:ok)
+          send_notification
         end
 
         private
 
         attr_reader :conference, :current_user
+
+        def send_notification
+          return unless conference.registrations_enabled?
+
+          Decidim::EventsManager.publish(
+            event: "decidim.events.conferences.registrations_enabled",
+            event_class: Decidim::Conferences::ConferenceRegistrationsEnabledEvent,
+            resource: conference,
+            followers: conference.followers
+          )
+        end
       end
     end
   end

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

@@ -23,6 +23,7 @@ module Decidim
         # Returns nothing.
         def call
           return broadcast(:invalid) if form.invalid?
+
           update_conference
           link_participatory_processes
           link_assemblies
@@ -99,7 +100,9 @@ module Decidim
         end
 
         def should_notify_followers_registrations_enabled?
-          @conference.previous_changes["registrations_enabled"].present? && @conference.registrations_enabled?
+          @conference.previous_changes["registrations_enabled"].present? &&
+            @conference.registrations_enabled? &&
+            @conference.published?
         end
 
         def send_notification_update_conference
@@ -112,7 +115,8 @@ module Decidim
         end
 
         def should_notify_followers_update_conference?
-          important_attributes.any? { |attr| @conference.previous_changes[attr].present? }
+          important_attributes.any? { |attr| @conference.previous_changes[attr].present? } &&
+            @conference.published?
         end
 
         def important_attributes
@@ -136,7 +140,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
@@ -144,7 +148,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
@@ -153,7 +157,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_diploma.rb

@@ -20,6 +20,7 @@ module Decidim
         def call
           @conference.with_lock do
             return broadcast(:invalid) if form.invalid?
+
             update_conference_diploma
             Decidim.traceability.perform_action!(:update_diploma, @conference, form.current_user) do
               @conference

data/app/commands/decidim/conferences/join_conference.rb

@@ -22,6 +22,7 @@ module Decidim
       def call
         conference.with_lock do
           return broadcast(:invalid) unless can_join_conference?
+
           create_registration
           create_meetings_registrations
           accept_invitation
@@ -77,6 +78,7 @@ module Decidim
       def notify_admin_over_percentage
         return send_notification_over(0.5) if occupied_slots_over?(0.5)
         return send_notification_over(0.8) if occupied_slots_over?(0.8)
+
         send_notification_over(1.0) if occupied_slots_over?(1.0)
       end
 

data/app/commands/decidim/conferences/leave_conference.rb

@@ -23,6 +23,7 @@ module Decidim
         @conference.with_lock do
           return broadcast(:invalid) unless registration
           return broadcast(:invalid) unless meetings_registrations
+
           destroy_registration
           destroy_meeting_registration
         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/conference_registrations_controller.rb

@@ -9,13 +9,14 @@ module Decidim
       #
       class ConferenceRegistrationsController < Decidim::Conferences::Admin::ApplicationController
         include Concerns::ConferenceAdmin
+        include Decidim::Paginable
 
         helper_method :conference
 
         def index
           enforce_permission_to :read_conference_registrations, :conference, conference: conference
 
-          @conference_registrations = Decidim::Conferences::ConferenceRegistration.where(conference: conference).page(params[:page]).per(15)
+          @conference_registrations = paginate(Decidim::Conferences::ConferenceRegistration.where(conference: conference))
         end
 
         def export
@@ -52,6 +53,7 @@ module Decidim
 
         def conference_registration
           return if params[:id].blank?
+
           @conference_registration ||= conference.conference_registrations.find_by(id: params[:id])
         end
       end

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

@@ -8,13 +8,14 @@ module Decidim
       class ConferenceSpeakersController < Decidim::Conferences::Admin::ApplicationController
         helper Decidim::Conferences::Admin::ConferenceSpeakersHelper
         include Concerns::ConferenceAdmin
+        include Decidim::Paginable
 
         def index
           enforce_permission_to :index, :conference_speaker
 
           @query = params[:q]
 
-          @conference_speakers = Decidim::Conferences::Admin::ConferenceSpeakers.for(collection, @query).page(params[:page]).per(15)
+          @conference_speakers = paginate(Decidim::Conferences::Admin::ConferenceSpeakers.for(collection, @query))
         end
 
         def new

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

@@ -7,10 +7,11 @@ module Decidim
       #
       class ConferenceUserRolesController < Decidim::Conferences::Admin::ApplicationController
         include Concerns::ConferenceAdmin
+        include Decidim::Paginable
 
         def index
           enforce_permission_to :index, :conference_user_role
-          @conference_user_roles = collection
+          @conference_user_roles = paginate(collection)
         end
 
         def new

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

@@ -8,10 +8,11 @@ module Decidim
       class ConferencesController < Decidim::Conferences::Admin::ApplicationController
         helper_method :current_conference, :current_participatory_space
         layout "decidim/admin/conferences"
+        include Decidim::Conferences::Admin::Filterable
 
         def index
           enforce_permission_to :read, :conference_list
-          @conferences = collection
+          @conferences = filtered_collection
         end
 
         def new
@@ -69,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/controllers/decidim/conferences/admin/media_links_controller.rb

@@ -6,11 +6,12 @@ module Decidim
       # Controller that allows managing conference media links.
       class MediaLinksController < Decidim::Conferences::Admin::ApplicationController
         include Concerns::ConferenceAdmin
+        include Decidim::Paginable
 
         def index
           enforce_permission_to :index, :media_link
 
-          @media_links = collection.page(params[:page]).per(15)
+          @media_links = paginate(collection)
         end
 
         def new