decidim-conferences 0.16.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5466e2076f3b13ddcbf7efff46d9faf4386dad859aa18320eb7d779ee3ab205
-  data.tar.gz: 0fdd4cd0e5ac9e90674929714a598904210a691744adfded1320899424c87ff1
+  metadata.gz: a350885d8989dcbed020295a179753dd257966cc6ea5234188a5257dc506d1c6
+  data.tar.gz: b28820eefb620c35d49d9caabae092c086397940793d510aad55d10c61148278
 SHA512:
-  metadata.gz: 00d2717138aff2524d063888374305526f3a500b6be4584f44e0fe6330dc0a86b67952f7673fd52a39f30c097c407959d7ff740b7420658cb2ddbba66aa1c484
-  data.tar.gz: 7ee62dcfa7c09f024e31253d7d98b38da7af991aaa4c850ad057c80311bc50669a2ad50305d78c2dcc4db6eee159cb4eb5f810ff513f8a4d02d331f4f2fbee8a
+  metadata.gz: 33434c66f9cbf62b02131047146097f0283b1e3cd9dc7a5bb11f41ca42589c8de7ceb30349ab23b19738b30286960f3c7f3aa30a1598b6ee08c5a74262a0b7b9
+  data.tar.gz: e1902107434422ba5f6527297db272b71cb536810e90fbbef7a5cb1d82575f956b4af61fc30e3519d3488ae06928d5dddb00606e8f6e9f05a4b2945c47553007

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_m/footer.erb

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

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/content_blocks/highlighted_conferences_cell.rb

@@ -4,7 +4,6 @@ module Decidim
   module Conferences
     module ContentBlocks
       class HighlightedConferencesCell < Decidim::ViewModel
-        delegate :current_organization, to: :controller
         delegate :current_user, to: :controller
 
         def show

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,15 +80,6 @@ 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

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

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/decidim/conferences/admin/application_controller.rb

@@ -5,6 +5,10 @@ module Decidim
     module Admin
       # The main admin application controller for conferences
       class ApplicationController < Decidim::Admin::ApplicationController
+        register_permissions(::Decidim::Conferences::Admin::ApplicationController,
+                             Decidim::Conferences::Permissions,
+                             Decidim::Admin::Permissions)
+
         private
 
         def permissions_context
@@ -14,10 +18,7 @@ module Decidim
         end
 
         def permission_class_chain
-          [
-            Decidim::Conferences::Permissions,
-            Decidim::Admin::Permissions
-          ]
+          ::Decidim.permissions_registry.chain_for(::Decidim::Conferences::Admin::ApplicationController)
         end
       end
     end

data/app/controllers/decidim/conferences/admin/concerns/conference_admin.rb

@@ -12,6 +12,11 @@ module Decidim
         module ConferenceAdmin
           extend ActiveSupport::Concern
 
+          RegistersPermissions
+            .register_permissions(::Decidim::Conferences::Admin::Concerns::ConferenceAdmin,
+                                  ::Decidim::Conferences::Permissions,
+                                  ::Decidim::Admin::Permissions)
+
           included do
             include Decidim::Admin::ParticipatorySpaceAdminContext
             participatory_space_admin_layout
@@ -35,10 +40,7 @@ module Decidim
             end
 
             def permission_class_chain
-              [
-                Decidim::Conferences::Permissions,
-                Decidim::Admin::Permissions
-              ]
+              PermissionsRegistry.chain_for(ConferenceAdmin)
             end
           end
         end

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

@@ -52,6 +52,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/application_controller.rb

@@ -10,6 +10,11 @@ module Decidim
 
       include NeedsPermission
 
+      register_permissions(::Decidim::Conferences::ApplicationController,
+                           Decidim::Conferences::Permissions,
+                           Decidim::Admin::Permissions,
+                           Decidim::Permissions)
+
       private
 
       def permissions_context
@@ -19,11 +24,7 @@ module Decidim
       end
 
       def permission_class_chain
-        [
-          Decidim::Conferences::Permissions,
-          Decidim::Admin::Permissions,
-          Decidim::Permissions
-        ]
+        ::Decidim.permissions_registry.chain_for(::Decidim::Conferences::ApplicationController)
       end
 
       def permission_scope

data/app/controllers/decidim/conferences/conference_program_controller.rb

@@ -11,7 +11,8 @@ module Decidim
       helper_method :collection, :conference, :meeting_days, :meeting_component
 
       def show
-        raise ActionController::RoutingError, "No meetings for this conference " if meetings.empty?
+        raise ActionController::RoutingError, "No meetings for this conference " if meetings.blank?
+
         enforce_permission_to :list, :program
         redirect_to decidim_conferences.conference_path(current_participatory_space) unless current_user_can_visit_space?
       end
@@ -20,11 +21,13 @@ module Decidim
 
       def meeting_component
         return if params[:id].blank?
+
         @meeting_component ||= current_participatory_space.components.where(manifest_name: "meetings").find_by(id: params[:id])
       end
 
       def meetings
         return unless meeting_component.published? || !meeting_component.presence
+
         @meetings ||= Decidim::Meetings::Meeting.where(component: meeting_component).visible_meeting_for(current_user).order(:start_time)
       end
 

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

@@ -65,6 +65,7 @@ module Decidim
       def redirect_after_path
         referer = request.headers["Referer"]
         return redirect_to(conference_path(conference)) if referer =~ /invitation_token/
+
         redirect_back fallback_location: conference_path(conference)
       end
     end

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

@@ -11,6 +11,7 @@ module Decidim
 
       def index
         raise ActionController::RoutingError, "No speakers for this conference " if speakers.empty?
+
         enforce_permission_to :list, :speakers
         redirect_to decidim_conferences.conference_path(current_participatory_space) unless current_user_can_visit_space?
       end

data/app/controllers/decidim/conferences/media_controller.rb

@@ -13,6 +13,7 @@ module Decidim
 
       def index
         raise ActionController::RoutingError, "No media_links for this conference " if media_links.empty? && current_participatory_space.attachments.empty?
+
         enforce_permission_to :list, :media_links
         redirect_to decidim_conferences.conference_path(current_participatory_space) unless current_user_can_visit_space?
       end

data/app/controllers/decidim/conferences/registration_types_controller.rb

@@ -11,6 +11,7 @@ module Decidim
 
       def index
         raise ActionController::RoutingError, "No registration types for this conference " if registration_types.empty? && current_participatory_space.registrations_enabled.empty?
+
         enforce_permission_to :list, :registration_types
         redirect_to decidim_conferences.conference_path(current_participatory_space) unless current_user_can_visit_space?
       end

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

@@ -62,6 +62,7 @@ module Decidim
 
         def processes_for_select
           return unless Decidim.participatory_space_manifests.map(&:name).include?(:participatory_processes)
+
           @processes_for_select ||= Decidim.find_participatory_space_manifest(:participatory_processes)
                                            .participatory_spaces.call(current_organization)&.order(title: :asc)&.map do |process|
             [
@@ -73,6 +74,7 @@ module Decidim
 
         def assemblies_for_select
           return unless Decidim.participatory_space_manifests.map(&:name).include?(:assemblies)
+
           @assemblies_for_select ||= Decidim.find_participatory_space_manifest(:assemblies)
                                             .participatory_spaces.call(current_organization)&.order(title: :asc)&.map do |assembly|
             [
@@ -84,6 +86,7 @@ module Decidim
 
         def consultations_for_select
           return unless Decidim.participatory_space_manifests.map(&:name).include?(:consultations)
+
           @consultations_for_select ||= Decidim.find_participatory_space_manifest(:consultations)
                                                .participatory_spaces.call(current_organization)&.order(title: :asc)&.map do |consultation|
             [
@@ -98,6 +101,7 @@ module Decidim
         def available_slots_greater_than_or_equal_to_registrations_count
           conference = OrganizationConferences.new(current_organization).query.find_by(slug: slug)
           return true if conference.blank?
+
           errors.add(:available_slots, :invalid) if available_slots < conference.conference_registrations.count
         end