decidim-meetings 0.26.0.rc2 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9568bd31e8ecd4cb37fb027814a8a5c2449216b6b1e558acf5fe8575a2345097
-  data.tar.gz: 990e28ce517e388eb89ba47aaf1cdaa2cce6716f56b447ad99807b36a9f130cf
+  metadata.gz: 26691ea95f69bf432c5fa438182b8ce6a20c897f15821a66dc92670ae76ec0eb
+  data.tar.gz: 6d5fd46688388abc4c87fbd8869c8bcf4fcf725974f4d1cc27ccea86ecf452a0
 SHA512:
-  metadata.gz: 8638daf48570af2b7a20e47446a00914ff665bc840cf43dbfd12b842c2a4f8b5ab94d1fdd006eaf32427ad8b83e1dd794bc1a3f9527ef00ded16d3954ed24387
-  data.tar.gz: 40e48c241eea64fa0a3bdb7d35739a7664d4fced584932016ac21a8248d316ec73e623509331d27bb12a0de72f5c0edddbfd042870898f992dde7fdd92d22303
+  metadata.gz: cb185e7bc69a84b2b5582a8ec5cb0f1619c7687a6c7f7b2c2a6db1a52aff31f1448bef465f14d5be0525f8a145278b21014ceeba0052a528815e0054c75ea837
+  data.tar.gz: 503ab4fda399ac1a43233b8d55afdff838b4b44f1e25d0d9416975c0f5e11c37379000e4a4d7e30a5c1118e984aed584154be8b9cfdad1bb2190eff21c54ef7b

data/app/cells/decidim/meetings/content_blocks/highlighted_meetings_cell.rb

@@ -5,7 +5,13 @@ module Decidim
     module ContentBlocks
       class HighlightedMeetingsCell < Decidim::ContentBlocks::HighlightedElementsCell
         def base_relation
-          Decidim::Meetings::Meeting.except_withdrawn.where(component: published_components)
+          Decidim::Meetings::Meeting
+            .except_withdrawn
+            .published
+            .not_hidden
+            .upcoming
+            .visible_meeting_for(current_user)
+            .where(component: published_components)
         end
 
         def elements

data/app/cells/decidim/meetings/content_blocks/upcoming_meetings_cell.rb

@@ -17,8 +17,10 @@ module Decidim
                                  .includes(component: :participatory_space)
                                  .where(component: meeting_components)
                                  .visible_meeting_for(current_user)
+                                 .published
                                  .where("end_time >= ?", Time.current)
                                  .except_withdrawn
+                                 .not_hidden
                                  .order(start_time: :asc)
                                  .limit(limit)
         end

data/app/cells/decidim/meetings/highlighted_meetings_for_component/show.erb

@@ -1,7 +1,8 @@
 <% if upcoming_meetings.any? %>
   <div class="section row collapse upcoming_meetings">
     <h3 class="section-heading">
-      <%= translated_attribute(model.name) %> - <%= t("decidim.participatory_spaces.highlighted_meetings.upcoming_meetings") %> <a href="<%= main_component_path(model) %>" class="text-small"><%= t("decidim.participatory_spaces.highlighted_meetings.see_all", count: meetings_count) %></a>
+      <%= translated_attribute(model.name) %> - <%= t("decidim.participatory_spaces.highlighted_meetings.upcoming_meetings") %>
+      <a href="<%= main_component_path(model) %>" class="text-small"><%= t("decidim.participatory_spaces.highlighted_meetings.see_all", count: upcoming_meetings_count) %></a>
     </h3>
     <div class="card card--list">
       <% upcoming_meetings.includes(:component).each do |meeting| %>
@@ -9,7 +10,7 @@
       <% end %>
     </div>
     <%= link_to(
-      t("decidim.participatory_spaces.highlighted_meetings.see_all", count: meetings_count),
+      t("decidim.participatory_spaces.highlighted_meetings.see_all", count: upcoming_meetings_count),
       main_component_path(model),
       class: "button button--sc hollow button--right"
     ) %>
@@ -17,7 +18,7 @@
 <% elsif past_meetings.any? %>
   <div class="section row collapse past_meetings">
     <h3 class="section-heading">
-      <%= translated_attribute(model.name) %> - <%= t("decidim.participatory_spaces.highlighted_meetings.past_meetings") %> <a href="<%= main_component_path(model) %>" class="text-small"><%= t("decidim.participatory_spaces.highlighted_meetings.see_all", count: meetings_count) %></a>
+      <%= translated_attribute(model.name) %> - <%= t("decidim.participatory_spaces.highlighted_meetings.past_meetings") %> <a href="<%= main_component_path(model) %>" class="text-small"><%= t("decidim.participatory_spaces.highlighted_meetings.see_all", count: past_meetings_count) %></a>
     </h3>
     <div class="card card--list">
       <% past_meetings.each do |meeting| %>
@@ -25,7 +26,7 @@
       <% end %>
     </div>
     <%= link_to(
-      t("decidim.participatory_spaces.highlighted_meetings.see_all", count: meetings_count),
+      t("decidim.participatory_spaces.highlighted_meetings.see_all", count: past_meetings_count),
       main_component_path(model),
       class: "button button--sc hollow button--right"
     ) %>

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

@@ -18,7 +18,11 @@ module Decidim
       private
 
       def meetings
-        @meetings ||= Decidim::Meetings::Meeting.where(component: model).except_withdrawn.visible_meeting_for(current_user)
+        @meetings ||= Decidim::Meetings::Meeting.where(component: model)
+                                                .except_withdrawn
+                                                .published
+                                                .not_hidden
+                                                .visible_meeting_for(current_user)
       end
 
       def past_meetings
@@ -32,6 +36,14 @@ module Decidim
       def meetings_count
         @meetings_count ||= meetings.count
       end
+
+      def past_meetings_count
+        @past_meetings_count ||= meetings.past.count
+      end
+
+      def upcoming_meetings_count
+        @upcoming_meetings_count ||= meetings.upcoming.count
+      end
     end
   end
 end

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

@@ -24,7 +24,7 @@ module Decidim
       end
 
       def resource_path
-        resource_locator(model).path(filter_link_params)
+        resource_locator(model).path
       end
 
       def title

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

@@ -28,7 +28,7 @@ module Decidim
       end
 
       def description
-        present(model).description(strip_tags: true)
+        present(model).description(strip_tags: true).truncate(120, separator: /\s/)
       end
 
       def badge

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

@@ -31,7 +31,7 @@ module Decidim
 
         def create_meeting!
           parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
-          parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
+          parsed_description = Decidim::ContentProcessor.parse(form.description, current_organization: form.current_organization).rewrite
           params = {
             scope: form.scope,
             category: form.category,

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

@@ -37,7 +37,7 @@ module Decidim
 
         def update_meeting!
           parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
-          parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
+          parsed_description = Decidim::ContentProcessor.parse(form.description, current_organization: form.current_organization).rewrite
 
           Decidim.traceability.update!(
             meeting,

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

@@ -31,7 +31,8 @@ module Decidim
 
       def create_meeting!
         parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
-        parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
+        parsed_description = Decidim::ContentProcessor.parse(form.description, current_organization: form.current_organization).rewrite
+
         params = {
           scope: form.scope,
           category: form.category,

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

@@ -37,7 +37,7 @@ module Decidim
 
       def update_meeting!
         parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
-        parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: form.current_organization).rewrite
+        parsed_description = Decidim::ContentProcessor.parse(form.description, current_organization: form.current_organization).rewrite
 
         Decidim.traceability.update!(
           meeting,

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

@@ -104,7 +104,7 @@ module Decidim
       private
 
       def meeting
-        @meeting ||= Meeting.not_hidden.where(component: current_component).find(params[:id])
+        @meeting ||= Meeting.not_hidden.where(component: current_component).find_by(id: params[:id])
       end
 
       def meetings

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

@@ -58,10 +58,6 @@ module Decidim
           end
 
           self.decidim_category_id = model.categorization.decidim_category_id if model.categorization
-          presenter = MeetingPresenter.new(model)
-
-          self.title = presenter.title(all_locales: title.is_a?(Hash))
-          self.description = presenter.description(all_locales: description.is_a?(Hash))
           self.type_of_meeting = model.type_of_meeting
         end
 

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

@@ -67,7 +67,25 @@ module Decidim
 
       # If the content is safe, HTML tags are sanitized, otherwise, they are stripped.
       def render_meeting_body(meeting)
-        render_sanitized_content(meeting, :description)
+        Decidim::ContentProcessor.render(render_sanitized_content(meeting, :description), "div")
+      end
+
+      def prevent_timeout_seconds
+        return 0 unless respond_to?(:meeting)
+        return 0 if !current_user || !meeting || !meeting.live?
+        return 0 unless online_or_hybrid_meeting?(meeting)
+        return 0 unless iframe_embed_or_live_event_page?(meeting)
+        return 0 unless meeting.iframe_access_level_allowed_for_user?(current_user)
+
+        (meeting.end_time - Time.current).to_i
+      end
+
+      def online_or_hybrid_meeting?(meeting)
+        meeting.online_meeting? || meeting.hybrid_meeting?
+      end
+
+      def iframe_embed_or_live_event_page?(meeting)
+        %w(embed_in_meeting_page open_in_live_event_page).include? meeting.iframe_embed_type
       end
     end
   end

data/app/jobs/decidim/meetings/upcoming_meeting_notification_job.rb

@@ -7,7 +7,10 @@ module Decidim
 
       def perform(meeting_id, checksum)
         meeting = Decidim::Meetings::Meeting.find(meeting_id)
-        send_notification(meeting) if verify_checksum(meeting, checksum)
+        return if meeting.hidden? || meeting.withdrawn?
+        return unless verify_checksum(meeting, checksum)
+
+        send_notification(meeting)
       end
 
       def self.generate_checksum(meeting)

data/app/packs/src/decidim/meetings/admin/meetings_form.js

@@ -118,7 +118,7 @@ $(() => {
       toggleDependsOnSelect($target, $meetingRegistrationUrl, "on_different_platform");
     });
 
-    $meetingRegistrationType.trigger("change");
+    toggleDependsOnSelect($meetingRegistrationType, $meetingRegistrationUrl, "on_different_platform");
 
     const $meetingTypeOfMeeting = $form.find("#meeting_type_of_meeting");
     const $meetingOnlineFields = $form.find(".field[data-meeting-type='online']");

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

@@ -7,12 +7,21 @@ module Decidim
     #
     class MeetingPresenter < Decidim::ResourcePresenter
       include Decidim::ResourceHelper
+      include ActionView::Helpers::UrlHelper
       include Decidim::SanitizeHelper
 
       def meeting
         __getobj__
       end
 
+      def meeting_path
+        Decidim::ResourceLocatorPresenter.new(meeting).path
+      end
+
+      def display_mention
+        link_to title, meeting_path
+      end
+
       def title(links: false, html_escape: false, all_locales: false)
         return unless meeting
 

data/app/services/decidim/meetings/meeting_iframe_embedder.rb

@@ -42,7 +42,7 @@ module Decidim
   loading="lazy"
   src="#{embed_transformed_url(request_host)}"
   style="height: 100%; width: 100%; border: 0px;"
-/>
+></iframe>
         )
       end
 

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

@@ -19,7 +19,7 @@
         <% end %>
       </div>
 
-      <button class="button add-service"><%= t(".add_service") %></button>
+      <button class="button add-service" type="button"><%= t(".add_service") %></button>
     </div>
   </div>
 </div>

data/app/views/decidim/meetings/layouts/live_event.html.erb

@@ -8,6 +8,7 @@
   </head>
 
   <body>
+    <%= render partial: "layouts/decidim/timeout_modal" %>
     <header class="meeting-polls__header">
       <% if current_user && poll %>
         <div class="flex--cc">

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

@@ -6,9 +6,9 @@
 
 <div class="row columns">
   <div class="title-action">
-    <h3 id="meetings-count" class="title-action__title section-heading">
+    <h2 id="meetings-count" class="title-action__title section-heading">
       <%= render partial: "count" %>
-    </h3>
+    </h2>
 
     <% if allowed_to?(:create, :meeting) %>
       <%= action_authorized_link_to :create, new_meeting_path, class: "title-action__action button small", data: { "redirect_url" => new_meeting_path } do %>

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

@@ -17,7 +17,7 @@ edit_link(
 
 <div class="row column view-header">
   <div class="m-bottom">
-    <%= link_to meetings_path(filter_link_params), class: "small hollow" do %>
+    <%= link_to meetings_path, class: "small hollow js-back-to-list" do %>
       <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
       <%= t(".back") %>
     <% end %>

data/config/locales/ar.yml

@@ -72,6 +72,18 @@ ar:
         other: التسجيلات
   decidim:
     admin:
+      filters:
+        meetings:
+          category_id_eq:
+            label: الفئة
+          origin_eq:
+            values:
+              citizen: المواطن
+              user_group: مجموعات المستخدمين
+          type_eq:
+            label: نوع الاجتماع
+            values:
+              in_person: وجهًا لوجه
       meeting_copies:
         create:
           error: كانت هناك مشكلة في تكرار هذا الاجتماع.
@@ -239,6 +251,8 @@ ar:
             success: تم حذف الاجتماع بنجاح
           edit:
             update: تحديث
+          form:
+            registration_email_help: سيظهر هذا النص في منتصف البريد الإلكتروني الخاص بتأكيد التسجيل مباشرة بعد رمز التسجيل.
           index:
             title: اجتماعات
           new:
@@ -299,6 +313,9 @@ ar:
           value_types:
             organizer_presenter:
               not_found: 'لم يتم العثور على المنظم في قاعدة البيانات (المعرف: %{id})'
+      application_helper:
+        filter_category_values:
+          all: الكل
       calendar_modal:
         calendar_url: العنوان الشبكي للتقويم
         close_window: أغلق النافذة
@@ -327,12 +344,16 @@ ar:
         filters:
           category: الفئة
           date: تاريخ
+          origin_values:
+            citizens: المواطنون
           search: بحث
         filters_small_view:
           close_modal: إغلاق مشروط
           filter: منقي
           filter_by: مصنف بواسطة
           unfold: كشف
+        form:
+          select_a_category: يُرجى اختيار فئة
         meeting_minutes:
           related_information: معلومات ذات صله
         meetings:
@@ -380,6 +401,10 @@ ar:
             map: خريطة
             start_time: تاريخ البدء
             title: عنوان
+      polls:
+        questions:
+          index_admin:
+            results: النتائج
       read_more: "(قراءة المزيد)"
       registration_mailer:
         confirmation:

data/config/locales/ca.yml

@@ -100,7 +100,7 @@ ca:
           type_eq:
             label: Tipus de trobada
             values:
-              hybrid: Ambdós
+              hybrid: Híbrida
               in_person: Presencial
               online: En línia
       meeting_copies:
@@ -184,7 +184,7 @@ ca:
           notification_title: La trobada <a href="%{resource_path}">%{resource_title}</a> començarà en menys de 48 hores.
     forms:
       meetings:
-        attendees_count_help_text: No oblidis incloure el nombre total d'assistents a la teva trobada, ja sigui presencial, en línia o híbrida.
+        attendees_count_help_text: No t'oblidis d'afegir el número total d'assistents a la trobada, sigui presencial, en línia o híbrida.
     gamification:
       badges:
         attended_meetings:
@@ -476,7 +476,7 @@ ca:
           type: Tipus
           type_values:
             all: Totes
-            hybrid: Ambdues
+            hybrid: Híbrida
             in_person: Presencial
             online: En línia
         filters_small_view:
@@ -525,11 +525,11 @@ ca:
           edit_close_meeting: Editeu l'informe de la reunió
           edit_meeting: Editar la trobada
           going: T'has inscrit en aquesta trobada
-          join: Inscriu-te a la trobada
+          join: Unir-se a la trobada
           leave: Cancel·la la teva inscripció
           leave_confirmation: Segur que vols cancel·lar la teva inscripció a aquesta trobada?
           link_available_soon: Enllaç disponible pròximament
-          link_closed: L'enllaç a la trobada estarà disponible uns minuts abans de que comenci
+          link_closed: L'enllaç a la sala de videoconferència estarà disponible uns minuts abans que comenci
           live_event: Aquesta trobada està succeint ara mateix
           meeting_minutes: Acta de la trobada
           micro_camera_permissions_warning: Quan facis clic en el botó de sota, se't demanaran permisos per al micròfon i/o la càmera, i t'uniràs a la videoconferència
@@ -567,7 +567,7 @@ ca:
           fields:
             closed: Tancada
             end_time: Data de finalització
-            id: Id
+            id: ID
             map: Mapa
             official_meeting: Trobada oficial
             start_time: Data d'inici
@@ -618,7 +618,7 @@ ca:
           invalid: S'ha produït un error en abandonar aquesta trobada.
           success: Has abandonat la trobada amb èxit.
       type_of_meeting:
-        hybrid: Ambdues
+        hybrid: Híbrida
         in_person: Presencial
         online: Online
       types:

data/config/locales/cs.yml

@@ -106,7 +106,7 @@ cs:
           type_eq:
             label: Typ schůzky
             values:
-              hybrid: Obojí
+              hybrid: Hybridní
               in_person: Osobně
               online: Online
       meeting_copies:
@@ -190,7 +190,7 @@ cs:
           notification_title: Setkání <a href="%{resource_path}">%{resource_title}</a> bude zahájeno za méně než 48 hodin.
     forms:
       meetings:
-        attendees_count_help_text: Nezapomeňte uvést celkový počet účastníků vaší akce. Ať už jde o osobní, kombinovanou nebo on-line, je důležité, abychom věděli, kolik lidí je zapojeno.
+        attendees_count_help_text: Nezapomeňte uvést celkový počet účastníků na vaší schůzce, ať už osobně, online nebo hybridně.
     gamification:
       badges:
         attended_meetings:
@@ -490,7 +490,7 @@ cs:
           type: Typ
           type_values:
             all: Vše
-            hybrid: Obojí
+            hybrid: Hybridní
             in_person: Osobně
             online: Online
         filters_small_view:
@@ -583,7 +583,7 @@ cs:
           fields:
             closed: Zavřeno
             end_time: Datum ukončení
-            id: Id
+            id: ID
             map: Mapa
             official_meeting: Oficiální schůzka
             start_time: Datum zahájení
@@ -596,7 +596,7 @@ cs:
             empty_questions: Během této schůzky budou zaslány některé dotazy a vy na ně budete moci odpovědět. Zobrazí se zde.
           index_admin:
             admin_dashboard: Řídicí panel administrace
-            edit: Upravit v administraci
+            edit: Upravit v panelu administrace
             question: Otázka
             received_answer: přijatá odpověď
             received_answers: přijaté odpovědi
@@ -636,7 +636,7 @@ cs:
           invalid: Při setkání došlo k problému.
           success: Zasedání jste úspěšně opustili.
       type_of_meeting:
-        hybrid: Obojí
+        hybrid: Hybridní
         in_person: Osobně
         online: Online
       types:

data/config/locales/de.yml

@@ -79,6 +79,7 @@ de:
           origin_eq:
             label: Ursprung
             values:
+              citizen: Bürger
               official: Offiziell
               user_group: Benutzergruppen
           scope_id_eq:
@@ -86,8 +87,8 @@ de:
           type_eq:
             label: Art des Treffens
             values:
-              hybrid: Beides
               in_person: Persönlich
+              online: Online
       meeting_copies:
         create:
           error: Es gab einen Fehler beim Duplizieren dieses Meetings.
@@ -286,6 +287,7 @@ de:
             registration_url_help: 'Link: Erlaubt den Teilnehmern den externen Service zu nutzen, den Sie für die Registrierung verwenden'
             select_a_meeting_type: Bitte eine Meeting-Typ auswählen
             select_a_registration_type: Bitte wählen Sie eine Registrierungsart aus
+            show_embedded_iframe_help: Nur wenige Dienste erlauben das Einbetten einer Veranstaltung oder eines Livestreams (Youtube, Twitch und Jitsi)
           index:
             title: Meetings
           new:
@@ -440,7 +442,6 @@ de:
           type: Art
           type_values:
             all: Alle
-            hybrid: Beides
             in_person: Persönlich
             online: Online
         filters_small_view:
@@ -460,6 +461,7 @@ de:
           select_a_category: Bitte wählen sie eine Kategorie
           select_a_meeting_type: Bitte eine Meeting-Art auswählen
           select_a_registration_type: Bitte wählen Sie eine Registrierungsart aus
+          show_embedded_iframe_help: Nur wenige Dienste erlauben das Einbetten einer Veranstaltung oder eines Livestreams (Youtube, Twitch und Jitsi)
         index:
           new_meeting: Neue Besprechung
         meeting_minutes:
@@ -546,7 +548,6 @@ de:
           invalid: Beim Verlassen dieses Meetings ist ein Problem aufgetreten.
           success: Sie haben das Meeting erfolgreich verlassen.
       type_of_meeting:
-        hybrid: Beides
         in_person: In Person
         online: Online
       types:

data/config/locales/en.yml

@@ -101,7 +101,7 @@ en:
           type_eq:
             label: Type of meeting
             values:
-              hybrid: Both
+              hybrid: Hybrid
               in_person: In Person
               online: Online
       meeting_copies:
@@ -185,7 +185,7 @@ en:
           notification_title: The <a href="%{resource_path}">%{resource_title}</a> meeting will start in less than 48h.
     forms:
       meetings:
-        attendees_count_help_text: Don’t forget to include the total number of participants at your event. Whether in person, hybrid, or online, it’s important that we know how many people are involved.
+        attendees_count_help_text: Don't forget to include the total number of attendees at your meeting, whether in person, online or hybrid.
     gamification:
       badges:
         attended_meetings:
@@ -477,7 +477,7 @@ en:
           type: Type
           type_values:
             all: All
-            hybrid: Both
+            hybrid: Hybrid
             in_person: In-person
             online: Online
         filters_small_view:
@@ -568,7 +568,7 @@ en:
           fields:
             closed: Closed
             end_time: End date
-            id: Id
+            id: ID
             map: Map
             official_meeting: Official meeting
             start_time: Start date
@@ -581,7 +581,7 @@ en:
             empty_questions: Throughout this meeting, some questions will be sent and you will be able to answer them. They will be displayed here.
           index_admin:
             admin_dashboard: Administrator dashboard
-            edit: Edit in the admin
+            edit: Edit in the admin panel
             question: Question
             received_answer: received answer
             received_answers: received answers
@@ -619,7 +619,7 @@ en:
           invalid: There was a problem leaving this meeting.
           success: You have left the meeting successfully.
       type_of_meeting:
-        hybrid: Both
+        hybrid: Hybrid
         in_person: In person
         online: Online
       types: