decidim-conferences 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0e842238aaaceb5245a50065ab55bded2a36ea31fa14c54dc8631f223ff75d3
-  data.tar.gz: c47d206b41f4c12721743942fdb7efe0e519f3c4fb4a8737f9a9a0cfc1bdc015
+  metadata.gz: a350885d8989dcbed020295a179753dd257966cc6ea5234188a5257dc506d1c6
+  data.tar.gz: b28820eefb620c35d49d9caabae092c086397940793d510aad55d10c61148278
 SHA512:
-  metadata.gz: 1fb525774a7fa599adf5f6b7cb736cd9b1ee11a5ef7d7668a0a72ed26511b9424f862f3c9da1e89bfc6660608bc3f3c720f2b5d095cc379438b7f8cb546d7d5d
-  data.tar.gz: 0a16252c6a48fdab476be5217fac2966c009fa5387479e2818f788e028a5be8ee1105037dad3a999815156160e167a7a1f04776855fd70f2071a92957187eecd
+  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_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,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/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/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
 

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

@@ -50,6 +50,7 @@ module Decidim
         def conference_meetings
           meeting_components = current_participatory_space.components.where(manifest_name: "meetings")
           return unless meeting_components || conference_meeting_ids.delete("").present?
+
           @conference_meetings ||= Decidim::ConferenceMeeting.where(component: meeting_components).where(id: conference_meeting_ids)
         end
 

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

@@ -36,6 +36,7 @@ module Decidim
         def conference_meetings
           meeting_components = current_participatory_space.components.where(manifest_name: "meetings")
           return unless meeting_components || conference_meeting_ids.delete("").present?
+
           @conference_meetings ||= Decidim::ConferenceMeeting.where(component: meeting_components).where(id: conference_meeting_ids)
         end
       end

data/app/helpers/decidim/conferences/conference_helper.rb

@@ -8,6 +8,7 @@ module Decidim
       #
       def render_date(conference)
         return l(conference.start_date, format: :decidim_with_month_name_short) if conference.start_date == conference.end_date
+
         "#{l(conference.start_date, format: :decidim_with_month_name_short)} - #{l(conference.end_date, format: :decidim_with_month_name_short)}"
       end
     end

data/app/models/decidim/conference.rb

@@ -20,10 +20,7 @@ module Decidim
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
                class_name: "Decidim::Organization"
-    belongs_to :area,
-               foreign_key: "decidim_area_id",
-               class_name: "Decidim::Area",
-               optional: true
+
     has_many :categories,
              foreign_key: "decidim_participatory_space_id",
              foreign_type: "decidim_participatory_space_type",
@@ -87,6 +84,7 @@ module Decidim
 
     def has_available_slots?
       return true if available_slots.zero?
+
       available_slots > conference_registrations.count
     end
 
@@ -96,11 +94,13 @@ module Decidim
 
     def diploma_sent?
       return false if diploma_sent_at.nil?
+
       true
     end
 
     def closed?
       return false if end_date.blank?
+
       end_date < Date.current
     end
   end

data/app/models/decidim/conference_user_role.rb

@@ -24,6 +24,7 @@ module Decidim
     # Private: check if the process and the user have the same organization
     def user_and_conference_same_organization
       return if !conference || !user
+
       errors.add(:conference, :invalid) unless user.organization == conference.organization
     end
   end

data/app/permissions/decidim/conferences/permissions.rb

@@ -30,6 +30,7 @@ module Decidim
         end
 
         return permission_action unless user
+
         if !has_manageable_conferences? && !user.admin?
           disallow!
           return permission_action
@@ -94,12 +95,14 @@ module Decidim
       # Checks if it has any manageable conference, with any possible role.
       def has_manageable_conferences?(role: :any)
         return unless user
+
         conferences_with_role_privileges(role).any?
       end
 
       # Whether the user can manage the given conference or not.
       def can_manage_conference?(role: :any)
         return unless user
+
         conferences_with_role_privileges(role).include? conference
       end
 
@@ -123,6 +126,7 @@ module Decidim
 
         return allow! if user&.admin?
         return allow! if conference.published?
+
         toggle_allow(can_manage_conference?)
       end
 
@@ -222,12 +226,14 @@ module Decidim
       # Everyone can read the conference list
       def user_can_read_conference_list?
         return unless read_conference_list_permission_action?
+
         toggle_allow(user.admin? || has_manageable_conferences?)
       end
 
       def user_can_read_current_conference?
         return unless read_conference_list_permission_action?
         return if permission_action.subject == :conference_list
+
         toggle_allow(user.admin? || can_manage_conference?)
       end