decidim-meetings 0.27.2 → 0.27.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b88ac00953596a7640770559687f1ba48657b65f11e0d706ebbb16f929f4c28
-  data.tar.gz: 552640be23e75bb9497ff5d9c3b9a0b629de0bc8a035968db1b5b0fb54811890
+  metadata.gz: 82da38a1aee360d967117d670596806b11330effeb6c09822419cba4fa2485ba
+  data.tar.gz: 3535abcc9cc00433e882a19d38cf046c0ef7ce80e491df08ad1e6160a8e7aa3d
 SHA512:
-  metadata.gz: 7b5d5eafa08343e8a4fbbbb8963e08d757b75bf80ab151652922e14e48f774e4809727ed483fe835b4218a0940a389d9f76ba8b3a640444f15bff894fce2894b
-  data.tar.gz: 046ed8504405af4923c73037b3463c63b78f5c920662c1501e3bb34a107a7f00920bb5ce940cd4e40778f94a6d487ade50aa5db2e93532016068883324f5cd23
+  metadata.gz: f29b5b1640ab33b03b8d3b795fc3720ff7efc136afb218f8ba91fe4cf0a4ec1cb06d56596ff89d6c31f8eb8027e487096c7aa165284422eeda9b44fc5d72500f
+  data.tar.gz: f85547fa23f5ec7c264fb19f5d3c63bee03bb807fd546ebf76ff6c3968daaaf380d843a0ef4ec1e3cc0c9fea681ba305ab5b7a317abc5caf88472c62fccbc95b

data/app/commands/decidim/meetings/admin/create_meeting.rb

@@ -52,6 +52,7 @@ module Decidim
             transparent: form.transparent,
             author: form.current_organization,
             registration_terms: form.current_component.settings.default_registration_terms,
+            registrations_enabled: form.registrations_enabled,
             component: form.current_component,
             questionnaire: Decidim::Forms::Questionnaire.new,
             iframe_embed_type: form.iframe_embed_type,

data/app/commands/decidim/meetings/admin/publish_meeting.rb

@@ -26,7 +26,7 @@ module Decidim
 
           transaction do
             publish_meeting
-            send_notification
+            send_notification unless meeting.previously_published?
             schedule_upcoming_meeting_notification
           end
 

data/app/commands/decidim/meetings/admin/update_meeting.rb

@@ -51,6 +51,7 @@ module Decidim
             online_meeting_url: form.online_meeting_url,
             registration_type: form.registration_type,
             registration_url: form.registration_url,
+            registrations_enabled: form.registrations_enabled,
             type_of_meeting: form.clean_type_of_meeting,
             address: form.address,
             latitude: form.latitude,

data/app/controllers/concerns/decidim/meetings/component_filterable.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Meetings
+    # A controller concern to specify default filter parameters for the
+    # controller resources within a meetings component.
+    module ComponentFilterable
+      extend ActiveSupport::Concern
+
+      included do
+        private
+
+        def default_filter_params
+          {
+            search_text_cont: "",
+            with_any_date: "upcoming",
+            activity: "all",
+            with_availability: "",
+            with_any_scope: default_filter_scope_params,
+            with_any_category: default_filter_category_params,
+            with_any_state: nil,
+            with_any_origin: default_filter_origin_params,
+            with_any_type: default_filter_type_params
+          }
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/meetings/calendars_controller.rb

@@ -5,13 +5,17 @@ module Decidim
     # Exposes the meeting resources as an .ics file so users can import them
     # to their favorite calendar app
     class CalendarsController < Decidim::Meetings::ApplicationController
+      include FilterResource
+      include Filterable
+      include ComponentFilterable
+
       layout false
       helper_method :meetings
       before_action :set_default_request_format
       skip_around_action :use_organization_time_zone
 
       def show
-        render plain: CalendarRenderer.for(current_component, params[:filter]), content_type: "type/calendar"
+        render plain: CalendarRenderer.for(current_component, filter_params), content_type: "type/calendar"
       end
 
       def meeting_calendar

data/app/controllers/decidim/meetings/directory/meetings_controller.rb

@@ -20,7 +20,7 @@ module Decidim
         helper_method :meetings, :search
 
         def calendar
-          render plain: CalendarRenderer.for(current_organization, params[:filter]), content_type: "type/calendar"
+          render plain: CalendarRenderer.for(current_organization, filter_params), content_type: "type/calendar"
         end
 
         private

data/app/controllers/decidim/meetings/meetings_controller.rb

@@ -6,6 +6,7 @@ module Decidim
     class MeetingsController < Decidim::Meetings::ApplicationController
       include FilterResource
       include Filterable
+      include ComponentFilterable
       include Flaggable
       include Withdrawable
       include FormFactory
@@ -129,20 +130,6 @@ module Decidim
       def meeting_form
         form(Decidim::Meetings::MeetingForm)
       end
-
-      def default_filter_params
-        {
-          search_text_cont: "",
-          with_any_date: "upcoming",
-          activity: "all",
-          with_availability: "",
-          with_any_scope: default_filter_scope_params,
-          with_any_category: default_filter_category_params,
-          with_any_state: nil,
-          with_any_origin: default_filter_origin_params,
-          with_any_type: default_filter_type_params
-        }
-      end
     end
   end
 end

data/app/forms/decidim/meetings/admin/meeting_form.rb

@@ -13,6 +13,7 @@ module Decidim
         attribute :private_meeting, Boolean
         attribute :transparent, Boolean
         attribute :registration_type, String
+        attribute :registrations_enabled, Boolean, default: false
         attribute :registration_url, String
         attribute :customize_registration_email, Boolean
         attribute :iframe_embed_type, String, default: "none"
@@ -132,6 +133,10 @@ module Decidim
           end
         end
 
+        def registrations_enabled
+          on_this_platform?
+        end
+
         def embeddable_meeting_url
           if online_meeting_url.present? && %w(embed_in_meeting_page open_in_live_event_page).include?(iframe_embed_type)
             embedder_service = Decidim::Meetings::MeetingIframeEmbedder.new(online_meeting_url)

data/app/helpers/decidim/meetings/application_helper.rb

@@ -60,7 +60,13 @@ module Decidim
       # frontend, the meeting body is considered as safe content; that's unless
       # the meeting comes from a collaborative_draft or a participatory_text.
       def safe_content?
-        rich_text_editor_in_public_views? || @meeting.official?
+        rich_text_editor_in_public_views? || safe_content_admin?
+      end
+
+      # For admin entered content, the meeting body can contain certain extra
+      # tags, such as iframes.
+      def safe_content_admin?
+        @meeting.official?
       end
 
       # If the content is safe, HTML tags are sanitized, otherwise, they are stripped.

data/app/views/decidim/meetings/admin/meetings/edit.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for(@form, url: { action: "update" }, html: { class: "form meetings_form edit_meeting" })  do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

data/app/views/decidim/meetings/admin/meetings/index.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t(".title")) %>
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">

data/app/views/decidim/meetings/admin/meetings/new.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for(@form, html: { class: "form meetings_form new_meeting" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

data/app/views/decidim/meetings/admin/registrations/_form.html.erb

@@ -51,7 +51,7 @@
     </div>
 
     <div class="row column">
-      <%= form.translated :editor, :registration_terms %>
+      <%= form.translated :editor, :registration_terms, toolbar: :content %>
     </div>
   </div>
 </div>

data/app/views/decidim/meetings/directory/meetings/_meetings.html.erb

@@ -22,5 +22,5 @@
       <%= card_for meeting, context: { show_space: true } %>
     <% end %>
   </div>
-  <%= decidim_paginate meetings, order_start_time: params[:order_start_time], scope_id: params[:scope_id] %>
+  <%= decidim_paginate meetings, order_start_time: params[:order_start_time], with_any_scope: params[:with_any_scope] %>
 <% end %>

data/app/views/decidim/meetings/meetings/_linked_meetings.html.erb

@@ -14,7 +14,7 @@
               <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
             </div>
           </div>
-          <%= decidim_sanitize_editor(present(meeting).description) %>
+          <%= decidim_sanitize_editor present(meeting).description(strip_tags: true) %>
         </div>
       </div>
     </div>

data/app/views/decidim/meetings/meetings/_meetings.html.erb

@@ -35,7 +35,7 @@
     <%= card_for meeting %>
   <% end %>
 </div>
-<%= decidim_paginate meetings, order_start_time: params[:order_start_time], scope_id: params[:scope_id] %>
+<%= decidim_paginate meetings, order_start_time: params[:order_start_time], with_any_scope: params[:with_any_scope] %>
 
 <div class="row">
   <div class="text-right">