decidim-meetings 0.26.4 → 0.26.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04f94c16d529fda407b975b572fe2afef5e0a69f97eecf1331e773d91e8c5a3c
-  data.tar.gz: c6d5ffabf1b8a64a8b132fda2f2502f74dae14841a84d85d89d046b180399aa9
+  metadata.gz: 2d14f27884cacd322a63c5ea75582f086d3067aadb7259f023eb0418971e61b3
+  data.tar.gz: 5b30c43af75e840f4af15ed9ff59e9eb6ea36776cd907e504c9309b1c728b4cb
 SHA512:
-  metadata.gz: 43d01c99de5b08427dc71f13765c25c9d28f732c0e5d4baa750bc4b1000bc15a03946312ce7a419a3a062aa39e81edea110659f67882480332338aa3b9588ee6
-  data.tar.gz: 7753214328280555959cffd6bfb48c4c4806b856f96c5fec1d05999e8f06efa948192ad9ab5fab6946fc9b4b722c94baaf59184e69452469b10c9aee7a60eb62
+  metadata.gz: 4585987697c2629a40dabbdcb5509157b9d113e0af231fb8b52d0e73935c72f3790c11ad8212e291d7d188e67190427987238b796b3e1360da3e6947d3181fe8
+  data.tar.gz: 3c86c3b8ccc2fc6b28ba47d33010e93ba75181547457dcd280822ecfd04236d43b88eb80f32fecc2b7634a13aa6c9e460faaca6ad41828529d7225a903cd98e7

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

@@ -53,6 +53,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,
             customize_registration_email: form.customize_registration_email,

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

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

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/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 :available_slots, Integer, default: 0
         attribute :customize_registration_email, Boolean
@@ -95,15 +96,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|
             [
@@ -122,6 +114,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
@@ -139,6 +136,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,12 +60,23 @@ 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.
       def render_meeting_body(meeting)
-        Decidim::ContentProcessor.render(render_sanitized_content(meeting, :description), "div")
+        sanitized = render_sanitized_content(meeting, :description)
+        if safe_content?
+          Decidim::ContentProcessor.render_without_format(sanitized).html_safe
+        else
+          Decidim::ContentProcessor.render(sanitized, "div")
+        end
       end
 
       def prevent_timeout_seconds

data/app/presenters/decidim/meetings/meeting_presenter.rb

@@ -31,12 +31,7 @@ module Decidim
       def description(links: false, extras: true, strip_tags: false, all_locales: false)
         return unless meeting
 
-        new_description = handle_locales(meeting.description, all_locales) do |content|
-          renderer = Decidim::ContentRenderers::HashtagRenderer.new(sanitized(content))
-          renderer.render(links: links).html_safe
-        end
-
-        content_handle_locale(new_description, all_locales, extras, links, strip_tags)
+        content_handle_locale(meeting.description, all_locales, extras, links, strip_tags)
       end
 
       def location(all_locales: false)

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

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

@@ -42,7 +42,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>