decidim-meetings 0.27.1 → 0.27.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84546327f162fbbc982c5766f9fde0a5ce5ef1748009d9171d07c073536ab03f
-  data.tar.gz: becb3796a0aaab80973a263f05257c5c5d3cb3d46a8fc338a6ffe677ecedfc34
+  metadata.gz: 22996c6eba8e4d08a0fea3fd677846567792c2b1826ad33027bf4023a183653a
+  data.tar.gz: 5cef864fb91bb45baa72ccb274e5d36fabfc31ef8ecacccf7abfe051ea4e4a43
 SHA512:
-  metadata.gz: d2c78defd156584709abe4a48100d2aab7eec3d677386cf60c4de768c131bfe8146cd2a1aa4b5efc6f39bafb2ccd6614a38e60ec1e5d82e433b1a4d97b77129d
-  data.tar.gz: 620bc0a54ba106f6b366b8008e10bba9cddc1ec6f2440268aed38c9d4e64e355757d20302661e1b41b6726b328ef0e05b41af9e2de1c8bda791e2412ef2e1f25
+  metadata.gz: d34e99ce49db7f4ece052065032ac934fb119959581dbf120a3efc833e86633c279b47afe85ec659e2494f1be2bcebb3e7c884ebd0b10347b24a93323b555b55
+  data.tar.gz: c2847c2c7b6c6f1dfac880c3594cb4a4a475f3a054ae0a508bc83f45f3fbbf8c5174a9b9301da98da78e7970feea34e539002d5bfa8ac9a1ef6ef9d4dcb7ff80

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

@@ -44,8 +44,8 @@ module Decidim
           @copied_meeting = Decidim.traceability.create!(
             Meeting,
             form.current_user,
-            scope: meeting.scope,
-            category: meeting.category,
+            scope: form.scope,
+            category: form.category,
             title: parsed_title,
             description: parsed_description,
             end_time: form.end_time,
@@ -60,10 +60,29 @@ module Decidim
             transparent: form.transparent,
             author: form.current_organization,
             questionnaire: form.questionnaire,
+            online_meeting_url: form.online_meeting_url,
+            type_of_meeting: form.type_of_meeting,
+            iframe_embed_type: form.iframe_embed_type,
+            iframe_access_level: form.iframe_access_level,
+            comments_enabled: form.comments_enabled,
+            comments_start_time: form.comments_start_time,
+            comments_end_time: form.comments_end_time,
+            registration_type: form.registration_type,
+            registration_url: form.registration_url,
+            **fields_from_meeting
+          )
+        end
+
+        def fields_from_meeting
+          {
             registrations_enabled: meeting.registrations_enabled,
             available_slots: meeting.available_slots,
-            registration_terms: meeting.registration_terms
-          )
+            registration_terms: meeting.registration_terms,
+            reserved_slots: meeting.reserved_slots,
+            customize_registration_email: meeting.customize_registration_email,
+            registration_form_enabled: meeting.registration_form_enabled,
+            registration_email_custom_content: meeting.registration_email_custom_content
+          }
         end
 
         def copy_services!

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/admin/meeting_copies_controller.rb

@@ -11,13 +11,13 @@ module Decidim
         def new
           enforce_permission_to :copy, :meeting, meeting: meeting
 
-          @form = form(MeetingCopyForm).from_model(meeting)
+          @form = form(MeetingForm).from_model(meeting)
         end
 
         def create
           enforce_permission_to :copy, :meeting, meeting: meeting
 
-          @form = form(MeetingCopyForm).from_params(params, current_component: current_component)
+          @form = form(MeetingForm).from_params(params, current_component: current_component)
 
           CopyMeeting.call(@form, meeting) do
             on(:ok) do

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"
@@ -92,15 +93,6 @@ module Decidim
           type_of_meeting.presence
         end
 
-        def type_of_meeting_select
-          Decidim::Meetings::Meeting::TYPE_OF_MEETING.map do |type|
-            [
-              I18n.t("type_of_meeting.#{type}", scope: "decidim.meetings"),
-              type
-            ]
-          end
-        end
-
         def iframe_access_level_select
           Decidim::Meetings::Meeting.iframe_access_levels.map do |level, _value|
             [
@@ -119,6 +111,11 @@ module Decidim
           end
         end
 
+        # Support for copy meeting
+        def questionnaire
+          Decidim::Forms::Questionnaire.new
+        end
+
         def on_this_platform?
           registration_type == "on_this_platform"
         end
@@ -136,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/meeting_copies/new.html.erb

@@ -1,5 +1,5 @@
 <%= decidim_form_for(@form, url: meeting_copies_path(meeting), method: :post, html: { class: "form copy_meetings " }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t("meeting_copies.new.title", scope: "decidim.admin"), select: t("meeting_copies.new.select", scope: "decidim.admin") } %>
+  <%= render partial: "decidim/meetings/admin/meetings/form", object: f, locals: { title: t("meeting_copies.new.title", scope: "decidim.admin"), select: t("meeting_copies.new.select", scope: "decidim.admin") } %>
 
   <div class="button--double form-general-submit">
     <%= f.submit t("meeting_copies.new.copy", scope: "decidim.admin") %>

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

@@ -102,6 +102,6 @@
   </div>
 </div>
 
-<%= render "services", form: form, id: tabs_id_for_service(blank_service) %>
+<%= render "decidim/meetings/admin/meetings/services", form: form, id: tabs_id_for_service(blank_service) %>
 
 <%= javascript_pack_tag "decidim_meetings_admin" %>

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/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>