decidim-meetings 0.27.0 → 0.27.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 678fc1eb355bb55e7c698fea60f3a8cdf1d126a393726a0666227ae8c39f1282
-  data.tar.gz: 63ecfe73be4ed3a68d3ad4e9534701d6b2ede93bf5c00dd7220cf6bc99646e1d
+  metadata.gz: 2b88ac00953596a7640770559687f1ba48657b65f11e0d706ebbb16f929f4c28
+  data.tar.gz: 552640be23e75bb9497ff5d9c3b9a0b629de0bc8a035968db1b5b0fb54811890
 SHA512:
-  metadata.gz: b53a44fb38b7829820ca5fa0fc48dda11522bb63faef1630ad9888241f6e56d40760f5a98bab8de30f81a3b86ffc2a22a220075299e293b1276dea2349f40422
-  data.tar.gz: 4adba9e32309bdb3f9ca5a59e116d28aa28c3b651852a8f2d22bf07e58ed72f443d305aa2eff3a0c016e1a919ddf306ad9ce194a8e9863ddcb3fbd514d9881c8
+  metadata.gz: 7b5d5eafa08343e8a4fbbbb8963e08d757b75bf80ab151652922e14e48f774e4809727ed483fe835b4218a0940a389d9f76ba8b3a640444f15bff894fce2894b
+  data.tar.gz: 046ed8504405af4923c73037b3463c63b78f5c920662c1501e3bb34a107a7f00920bb5ce940cd4e40778f94a6d487ade50aa5db2e93532016068883324f5cd23

data/app/cells/decidim/meetings/meeting_list_item_cell.rb

@@ -28,7 +28,7 @@ module Decidim
       end
 
       def title
-        present(model).title
+        present(model).title(html_escape: true)
       end
 
       def resource_date_time

data/app/cells/decidim/meetings/meeting_m_cell.rb

@@ -24,7 +24,7 @@ module Decidim
       end
 
       def title
-        present(model).title
+        present(model).title(html_escape: true)
       end
 
       def description

data/app/cells/decidim/meetings/meeting_s_cell.rb

@@ -5,8 +5,6 @@ module Decidim
     # This cell renders the Small (:s) meeting card
     # for an given instance of a Meeting
     class MeetingSCell < MeetingMCell
-      delegate :title, to: :presenter
-
       def meeting_path
         resource_locator(model).path
       end
@@ -23,10 +21,6 @@ module Decidim
         resource_locator(model.component.participatory_space).path
       end
 
-      def presenter
-        @presenter ||= Decidim::Meetings::MeetingPresenter.new(model)
-      end
-
       private
 
       def cache_hash

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

@@ -92,15 +92,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 +110,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

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

@@ -65,7 +65,12 @@ module Decidim
 
       # 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

@@ -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/meetings/index.html.erb

@@ -48,7 +48,7 @@
                 <%= meeting.id %><br>
               </td>
               <td>
-                <%= present(meeting).title %><br>
+                <%= present(meeting).title(html_escape: true) %><br>
               </td>
               <td>
                 <% if meeting.start_time %>

data/config/locales/ar.yml

@@ -2,10 +2,6 @@
 ar:
   activemodel:
     attributes:
-      agenda:
-        description: وصف
-        duration: المدة الزمنية
-        title: عنوان
       close_meeting:
         attendees_count: عدد الحضور
         attending_organizations: قائمة المنظمات التي حضرت
@@ -19,7 +15,6 @@ ar:
         decidim_category_id: الفئة
         decidim_scope_id: نطاق
         description: وصف
-        end_time: وقت النهاية
         location: موقعك
         location_hints: تلميحات الموقع
         organizer_id: منظم
@@ -27,7 +22,6 @@ ar:
         registration_form_enabled: تم تمكين نموذج التسجيل
         registration_terms: شروط التسجيل
         registrations_enabled: تم تمكين التسجيلات
-        start_time: وقت البدء
         title: عنوان
         transparent: شفاف
     errors:

data/config/locales/bg.yml

@@ -1,11 +1,5 @@
 ---
 bg:
-  activemodel:
-    attributes:
-      agenda:
-        description: Описание
-        duration: Продължителност
-        title: Заглавие
   decidim:
     meetings:
       actions:

data/config/locales/ca.yml

@@ -2,10 +2,6 @@
 ca:
   activemodel:
     attributes:
-      agenda:
-        description: Descripció
-        duration: Durada
-        title: Títol
       close_meeting:
         attendees_count: Nombre d'assistents
         attending_organizations: Llista d'organitzacions que han participat
@@ -23,8 +19,9 @@ ca:
         decidim_scope_id: Àmbit
         decidim_user_group_id: Grup d'usuàries
         description: Descripció
-        end_time: Hora de finalització
+        end_time: Dia i hora de finalització
         id: ID
+        iframe_embed_type: Visualització de la sala de videoconferència
         location: Ubicació
         location_hints: Detalls d'ubicació
         online_meeting_url: URL de trobada en línia
@@ -34,13 +31,26 @@ ca:
         registration_email_custom_content: Contingut personalitzat del correu d'inscripció
         registration_form_enabled: Formulari d'inscripcions habilitat
         registration_terms: Termes i condicions d'inscripció
+        registration_type: Tipus d'inscripció
         registration_url: URL d'inscripció
         registrations_enabled: Inscripcions obertes
-        show_embedded_iframe: Mostrar iframe incrustat per aquesta URL
-        start_time: Hora d'inici
+        reserved_slots: Places reservades per aquesta trobada
+        start_time: Dia i hora d'inici
         title: Títol
         transparent: Transparent
         type_of_meeting: Tipus
+      meeting_agenda:
+        title: Títol
+        visible: Visible
+      meeting_agenda_items:
+        description: Descripció
+        duration: Durada
+        title: Títol
+      meeting_registration_invite:
+        email: Correu electrònic
+        name: Nom
+      validate_registration_code:
+        code: Codi
     errors:
       models:
         meeting:
@@ -283,9 +293,6 @@ ca:
           edit:
             close: Tancar
             title: Tancar trobada
-        meeting_copies:
-          form:
-            select_a_meeting_type: Si us plau, selecciona un tipus de trobada
         meetings:
           close:
             invalid: S'ha produït un error en tancar aquesta trobada

data/config/locales/cs.yml

@@ -2,10 +2,6 @@
 cs:
   activemodel:
     attributes:
-      agenda:
-        description: Popis
-        duration: Doba trvání
-        title: Název
       close_meeting:
         attendees_count: Počet účastníků
         attending_organizations: Seznam organizací, které se zúčastnily
@@ -25,6 +21,7 @@ cs:
         description: Popis
         end_time: Čas ukončení
         id: ID
+        iframe_embed_type: Typ vloženého rámu
         location: Umístění
         location_hints: Nápověda k poloze
         online_meeting_url: URL online schůzky
@@ -34,13 +31,26 @@ cs:
         registration_email_custom_content: Přizpůsobený obsah registračního e-mailu
         registration_form_enabled: Registrační formulář je povolen
         registration_terms: Podmínky registrace
+        registration_type: Typ registrace
         registration_url: URL registrace
         registrations_enabled: Registrace povoleny
-        show_embedded_iframe: Zobrazit vložený iframe pro tuto URL
+        reserved_slots: Rezervované sloty pro tuto schůzku
         start_time: Čas zahájení
         title: Název
         transparent: Transparentní
         type_of_meeting: Typ
+      meeting_agenda:
+        title: Název
+        visible: Viditelné
+      meeting_agenda_items:
+        description: Popis
+        duration: Doba trvání
+        title: Název
+      meeting_registration_invite:
+        email: E-mail
+        name: Jméno
+      validate_registration_code:
+        code: Kód
     errors:
       models:
         meeting:
@@ -291,9 +301,6 @@ cs:
           edit:
             close: Zavřít
             title: Zavřete schůzku
-        meeting_copies:
-          form:
-            select_a_meeting_type: Vyberte prosím typ schůzky
         meetings:
           close:
             invalid: Při setkání došlo k problému

data/config/locales/de.yml

@@ -2,10 +2,6 @@
 de:
   activemodel:
     attributes:
-      agenda:
-        description: Beschreibung
-        duration: Dauer
-        title: Titel
       close_meeting:
         attendees_count: Anzahl der Teilnehmer
         attending_organizations: Liste der Organisationen, die teilgenommen haben
@@ -23,7 +19,6 @@ de:
         decidim_scope_id: Umfang
         decidim_user_group_id: Benutzergruppe
         description: Beschreibung
-        end_time: Endzeit
         id: ID
         location: Ort
         location_hints: Standorthinweise
@@ -36,11 +31,21 @@ de:
         registration_terms: Registrierungsbedingungen
         registration_url: Registrierungs-URL
         registrations_enabled: Registrierungen aktiviert
-        show_embedded_iframe: Eingebetteten Iframe für diese URL anzeigen
-        start_time: Startzeit
         title: Titel
         transparent: Transparent
         type_of_meeting: Art
+      meeting_agenda:
+        title: Titel
+        visible: Sichtbar
+      meeting_agenda_items:
+        description: Beschreibung
+        duration: Dauer
+        title: Titel
+      meeting_registration_invite:
+        email: E-Mail
+        name: Name
+      validate_registration_code:
+        code: Code
     errors:
       models:
         meeting_agenda:
@@ -279,9 +284,6 @@ de:
           edit:
             close: Schließen
             title: Sitzung beenden
-        meeting_copies:
-          form:
-            select_a_meeting_type: Bitte eine Meeting-Typ auswählen
         meetings:
           close:
             invalid: Beim Schließen dieses Meetings ist ein Problem aufgetreten

data/config/locales/el.yml

@@ -2,10 +2,6 @@
 el:
   activemodel:
     attributes:
-      agenda:
-        description: Περιγραφή
-        duration: Διάρκεια
-        title: Τίτλος
       close_meeting:
         attendees_count: Αριθμός συμμετεχόντων
         attending_organizations: Λίστα οργανισμών που συμμετείχαν
@@ -19,7 +15,6 @@ el:
         decidim_category_id: Κατηγορία
         decidim_scope_id: Πεδίο εφαρμογής
         description: Περιγραφή
-        end_time: Ώρα λήξης
         location: Τοποθεσία
         location_hints: Υποδείξεις τοποθεσίας
         organizer_id: Διοργανωτής
@@ -27,7 +22,6 @@ el:
         registration_form_enabled: Η φόρμα εγγραφής ενεργοποιήθηκε
         registration_terms: Όροι εγγραφής
         registrations_enabled: Οι εγγραφές ενεργοποιήθηκαν
-        start_time: Ώρα έναρξης
         title: Τίτλος
         transparent: Διαφανής
     errors:

data/config/locales/en.yml

@@ -2,10 +2,6 @@
 en:
   activemodel:
     attributes:
-      agenda:
-        description: Description
-        duration: Duration
-        title: Title
       close_meeting:
         attendees_count: Number of attendees
         attending_organizations: List of organizations that attended
@@ -23,8 +19,9 @@ en:
         decidim_scope_id: Scope
         decidim_user_group_id: User group
         description: Description
-        end_time: End Time
+        end_time: End time
         id: ID
+        iframe_embed_type: Iframe embed type
         location: Location
         location_hints: Location hints
         online_meeting_url: Online meeting URL
@@ -34,13 +31,26 @@ en:
         registration_email_custom_content: Registration email custom content
         registration_form_enabled: Registration form enabled
         registration_terms: Registration terms
+        registration_type: Registration type
         registration_url: Registration URL
         registrations_enabled: Registrations enabled
-        show_embedded_iframe: Show embedded iframe for this URL
-        start_time: Start Time
+        reserved_slots: Reserved slots for this meeting
+        start_time: Start time
         title: Title
         transparent: Transparent
         type_of_meeting: Type
+      meeting_agenda:
+        title: Title
+        visible: Visible
+      meeting_agenda_items:
+        description: Description
+        duration: Duration
+        title: Title
+      meeting_registration_invite:
+        email: Email
+        name: Name
+      validate_registration_code:
+        code: Code
     errors:
       models:
         meeting:
@@ -283,9 +293,6 @@ en:
           edit:
             close: Close
             title: Close meeting
-        meeting_copies:
-          form:
-            select_a_meeting_type: Please select a meeting type
         meetings:
           close:
             invalid: There was a problem closing this meeting

data/config/locales/es-MX.yml

@@ -2,10 +2,6 @@
 es-MX:
   activemodel:
     attributes:
-      agenda:
-        description: Descripción
-        duration: Duración
-        title: Título
       close_meeting:
         attendees_count: Número de asistentes
         attending_organizations: Lista de organizaciones que han participado
@@ -23,8 +19,9 @@ es-MX:
         decidim_scope_id: Ámbito
         decidim_user_group_id: Grupo de usuarias
         description: Descripción
-        end_time: Hora de finalización
+        end_time: Día y hora de finalización
         id: ID
+        iframe_embed_type: Visualización de la sala de videoconferencia
         location: Ubicación
         location_hints: Pistas de ubicación
         online_meeting_url: URL del encuentro online
@@ -34,13 +31,26 @@ es-MX:
         registration_email_custom_content: Contenido personalizado del email de inscripción
         registration_form_enabled: Formulario de inscripción habilitado
         registration_terms: Términos y condiciones de inscripción
+        registration_type: Tipo de inscripción
         registration_url: URL de inscripción
         registrations_enabled: Inscripciones abiertas
-        show_embedded_iframe: Mostrar iframe incrustado para esta URL
-        start_time: Hora de inicio
+        reserved_slots: Plazas reservadas para este encuentro
+        start_time: Día y hora de inicio
         title: Título
         transparent: Transparente
         type_of_meeting: Tipo
+      meeting_agenda:
+        title: Título
+        visible: Visible
+      meeting_agenda_items:
+        description: Descripción
+        duration: Duración
+        title: Título
+      meeting_registration_invite:
+        email: Correo electrónico
+        name: Nombre
+      validate_registration_code:
+        code: Código
     errors:
       models:
         meeting:
@@ -283,9 +293,6 @@ es-MX:
           edit:
             close: Cerrar
             title: Cerrar encuentro
-        meeting_copies:
-          form:
-            select_a_meeting_type: Por favor, selecciona un tipo de encuentro
         meetings:
           close:
             invalid: Ha habido un problema al cerrar este encuentro

data/config/locales/es-PY.yml

@@ -2,10 +2,6 @@
 es-PY:
   activemodel:
     attributes:
-      agenda:
-        description: Descripción
-        duration: Duración
-        title: Título
       close_meeting:
         attendees_count: Número de asistentes
         attending_organizations: Lista de organizaciones que han participado
@@ -23,8 +19,9 @@ es-PY:
         decidim_scope_id: Ámbito
         decidim_user_group_id: Grupo de usuarias
         description: Descripción
-        end_time: Hora de finalización
+        end_time: Día y hora de finalización
         id: ID
+        iframe_embed_type: Visualización de la sala de videoconferencia
         location: Ubicación
         location_hints: Pistas de ubicación
         online_meeting_url: URL del encuentro online
@@ -34,13 +31,26 @@ es-PY:
         registration_email_custom_content: Contenido personalizado del email de inscripción
         registration_form_enabled: Formulario de inscripción habilitado
         registration_terms: Términos y condiciones de inscripción
+        registration_type: Tipo de inscripción
         registration_url: URL de inscripción
         registrations_enabled: Inscripciones abiertas
-        show_embedded_iframe: Mostrar iframe incrustado para esta URL
-        start_time: Hora de inicio
+        reserved_slots: Plazas reservadas para este encuentro
+        start_time: Día y hora de inicio
         title: Título
         transparent: Transparente
         type_of_meeting: Tipo
+      meeting_agenda:
+        title: Título
+        visible: Visible
+      meeting_agenda_items:
+        description: Descripción
+        duration: Duración
+        title: Título
+      meeting_registration_invite:
+        email: Correo electrónico
+        name: Nombre
+      validate_registration_code:
+        code: Código
     errors:
       models:
         meeting:
@@ -283,9 +293,6 @@ es-PY:
           edit:
             close: Cerrar
             title: Cerrar encuentro
-        meeting_copies:
-          form:
-            select_a_meeting_type: Por favor, selecciona un tipo de encuentro
         meetings:
           close:
             invalid: Ha habido un problema al cerrar este encuentro

data/config/locales/es.yml

@@ -2,10 +2,6 @@
 es:
   activemodel:
     attributes:
-      agenda:
-        description: Descripción
-        duration: Duración
-        title: Título
       close_meeting:
         attendees_count: Número de asistentes
         attending_organizations: Lista de organizaciones que han participado
@@ -23,8 +19,9 @@ es:
         decidim_scope_id: Ámbito
         decidim_user_group_id: Grupo
         description: Descripción
-        end_time: Hora de finalización
+        end_time: Día y hora de finalización
         id: ID
+        iframe_embed_type: Visualización de la sala de videoconferencia
         location: Ubicación
         location_hints: Detalles de ubicación
         online_meeting_url: URL del encuentro online
@@ -34,13 +31,26 @@ es:
         registration_email_custom_content: Contenido personalizado del email de inscripción
         registration_form_enabled: Formulario de inscripción habilitado
         registration_terms: Términos y condiciones de inscripción
+        registration_type: Tipo de inscripción
         registration_url: URL de inscripción
         registrations_enabled: Inscripciones abiertas
-        show_embedded_iframe: Mostrar iframe incrustado para esta URL
-        start_time: Hora de inicio
+        reserved_slots: Plazas reservadas para este encuentro
+        start_time: Día y hora de inicio
         title: Título
         transparent: Transparente
         type_of_meeting: Tipo
+      meeting_agenda:
+        title: Título
+        visible: Visible
+      meeting_agenda_items:
+        description: Descripción
+        duration: Duración
+        title: Título
+      meeting_registration_invite:
+        email: Correo electrónico
+        name: Nombre
+      validate_registration_code:
+        code: Código
     errors:
       models:
         meeting:
@@ -283,9 +293,6 @@ es:
           edit:
             close: Cerrar
             title: Cerrar encuentro
-        meeting_copies:
-          form:
-            select_a_meeting_type: Por favor, selecciona un tipo de encuentro
         meetings:
           close:
             invalid: Se ha producido un error al cerrar este encuentro