decidim-meetings 0.26.1 → 0.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e68d252396f00c0349451ad1fc9d8b060fb66be5f1c6940a778e3dfa5bbf9d1
-  data.tar.gz: 9b8cf933f00544fea3fb7cbb8961afcf5ec9fea099bf3efcb329d6f88386c388
+  metadata.gz: b48196f783869c2445a9a77fb0165993387afdedc39f68810e2e283b0ac7b6ec
+  data.tar.gz: 6a1a0aa182b12070721adf374b69cd60bfd5bb26ee6b414f17091f99f079a145
 SHA512:
-  metadata.gz: fd546f8b6ce3f8a0d431974d84638102b2196ff7b9f9e91045fedfaad285546eb20f6e8e458c8988bd837d7fb9605ea99dbb83c45b6064b94b8c8ae653de9728
-  data.tar.gz: 206ac13a27ed35a22e9ef8e94bbe1b659a71f3dc0555b213d834c05098f63b50d4368dc822ed8af24e8814a80de92a81db5e3c4f8388e17b336df111f37ff714
+  metadata.gz: 7a29b8d8ab0101382536ac4c65b1d9e7c40723c5ba29c18a5817bfe60e394b5fc192ed1ce7e119414c67f04e77f4b5de62424e078282af0aa1c5aba04c5a5970
+  data.tar.gz: 66e260950f4d2c55964d424c93a97646d534fb12d135afceacefb5523a32718b7f471a145b2f8a2f56f0919ba8b45e5dd23e4333ca632e7fa0fa5dda2b0528d3

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/join_meeting.rb

@@ -25,7 +25,8 @@ module Decidim
           return broadcast(:invalid) unless can_join_meeting?
           return broadcast(:invalid_form) unless registration_form.valid?
 
-          answer_questionnaire
+          return broadcast(:invalid) if answer_questionnaire == :invalid
+
           create_registration
           accept_invitation
           send_email_confirmation
@@ -48,7 +49,15 @@ module Decidim
       def answer_questionnaire
         return unless questionnaire?
 
-        Decidim::Forms::AnswerQuestionnaire.call(registration_form, user, meeting.questionnaire)
+        Decidim::Forms::AnswerQuestionnaire.call(registration_form, user, meeting.questionnaire) do
+          on(:ok) do
+            return :valid
+          end
+
+          on(:invalid) do
+            return :invalid
+          end
+        end
       end
 
       def create_registration

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/directory/meetings_controller.rb

@@ -25,7 +25,8 @@ module Decidim
         private
 
         def meetings
-          @meetings ||= paginate(search.results)
+          is_past_meetings = params.dig("filter", "date")&.include?("past")
+          @meetings ||= paginate(search.results.order(start_time: is_past_meetings ? :desc : :asc))
         end
 
         def search_klass

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

@@ -104,11 +104,12 @@ 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
-        @meetings ||= paginate(search.results.order(start_time: :desc))
+        is_past_meetings = params.dig("filter", "date")&.include?("past")
+        @meetings ||= paginate(search.results.order(start_time: is_past_meetings ? :desc : :asc))
       end
 
       def registration
@@ -126,7 +127,7 @@ module Decidim
       def default_filter_params
         {
           search_text: "",
-          date: %w(upcoming),
+          date: "upcoming",
           activity: "all",
           scope_id: default_filter_scope_params,
           category_id: default_filter_category_params,

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

@@ -41,13 +41,11 @@ module Decidim
       end
 
       def filter_date_values
-        TreeNode.new(
-          TreePoint.new("", t("decidim.meetings.meetings.filters.date_values.all")),
-          [
-            TreePoint.new("upcoming", t("decidim.meetings.meetings.filters.date_values.upcoming")),
-            TreePoint.new("past", t("decidim.meetings.meetings.filters.date_values.past"))
-          ]
-        )
+        [
+          ["all", t("decidim.meetings.meetings.filters.date_values.all")],
+          ["upcoming", t("decidim.meetings.meetings.filters.date_values.upcoming")],
+          ["past", t("decidim.meetings.meetings.filters.date_values.past")]
+        ]
       end
 
       # Options to filter meetings by activity.
@@ -67,7 +65,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/helpers/decidim/meetings/directory/application_helper.rb

@@ -27,13 +27,11 @@ module Decidim
         end
 
         def filter_date_values
-          TreeNode.new(
-            TreePoint.new("", t("decidim.meetings.meetings.filters.date_values.all")),
-            [
-              TreePoint.new("upcoming", t("decidim.meetings.meetings.filters.date_values.upcoming")),
-              TreePoint.new("past", t("decidim.meetings.meetings.filters.date_values.past"))
-            ]
-          )
+          [
+            ["all", t("decidim.meetings.meetings.filters.date_values.all")],
+            ["upcoming", t("decidim.meetings.meetings.filters.date_values.upcoming")],
+            ["past", t("decidim.meetings.meetings.filters.date_values.past")]
+          ]
         end
 
         def directory_filter_scopes_values

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/models/decidim/meetings/agenda_item.rb

@@ -11,7 +11,7 @@ module Decidim
 
       translatable_fields :title, :description
 
-      belongs_to :agenda, -> { order(:position) }, foreign_key: "decidim_agenda_id", class_name: "Decidim::Meetings::Agenda"
+      belongs_to :agenda, foreign_key: "decidim_agenda_id", class_name: "Decidim::Meetings::Agenda"
 
       has_many :agenda_item_children, foreign_key: "parent_id", class_name: "Decidim::Meetings::AgendaItem", inverse_of: :parent, dependent: :destroy
       belongs_to :parent, class_name: "Decidim::Meetings::AgendaItem", inverse_of: :agenda_item_children, optional: true

data/app/models/decidim/meetings/meeting.rb

@@ -63,9 +63,12 @@ module Decidim
       scope :visible_meeting_for, lambda { |user|
         (all.distinct if user&.admin?) ||
           if user.present?
-            spaces = Decidim.participatory_space_registry.manifests.map do |manifest|
+            spaces = Decidim.participatory_space_registry.manifests.filter_map do |manifest|
+              table_name = manifest.model_class_name.constantize.try(:table_name)
+              next if table_name.blank?
+
               {
-                name: manifest.model_class_name.constantize.table_name.singularize,
+                name: table_name.singularize,
                 class_name: manifest.model_class_name
               }
             end

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/views/decidim/meetings/directory/meetings/_filters.html.erb

@@ -15,7 +15,7 @@
   </div>
 
   <% unless @forced_past_meetings %>
-    <%= form.check_boxes_tree :date, filter_date_values, legend_title: t("decidim.meetings.meetings.filters.date") %>
+    <%= form.collection_radio_buttons :date, filter_date_values, :first, :last, legend_title: t("decidim.meetings.meetings.filters.date") %>
   <% end %>
 
   <%= form.check_boxes_tree :type, filter_type_values, legend_title: t("decidim.meetings.meetings.filters.type") %>

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/_filters.html.erb

@@ -17,7 +17,7 @@
   <%= form.hidden_field "state", value: params.dig("filter", "state") %>
 
   <% unless @forced_past_meetings %>
-    <%= form.check_boxes_tree :date, filter_date_values, legend_title: t(".date") %>
+    <%= form.collection_radio_buttons :date, filter_date_values, :first, :last, legend_title: t(".date") %>
   <% end %>
 
   <%= form.check_boxes_tree :type, filter_type_values, legend_title: t(".type") %>

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

@@ -1,12 +1,18 @@
 var $meetings = $('#meetings');
 var $meetingsCount = $('#meetings-count');
 
+// make sure that calendar modal will use the updated filter values
+var $calendarShare = $('#calendarShare');
+$calendarShare.remove();
+
 $meetings.html('<%= j(render partial: "meetings").strip.html_safe %>');
 $meetingsCount.html('<%= j(render partial: "count").strip.html_safe %>');
 
 var $dropdownMenu = $('.dropdown.menu', $meetings);
 $dropdownMenu.foundation();
 
+$("#calendarShare").foundation(); // initialize export calendar on the page
+
 var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.results.select(&:geocoded_and_valid?)).to_json.html_safe %>');
 
 var $map = $("#map");

data/config/locales/ar.yml

@@ -76,6 +76,14 @@ ar:
         meetings:
           category_id_eq:
             label: الفئة
+          origin_eq:
+            values:
+              citizen: المواطن
+              user_group: مجموعات المستخدمين
+          type_eq:
+            label: نوع الاجتماع
+            values:
+              in_person: وجهًا لوجه
       meeting_copies:
         create:
           error: كانت هناك مشكلة في تكرار هذا الاجتماع.
@@ -243,6 +251,8 @@ ar:
             success: تم حذف الاجتماع بنجاح
           edit:
             update: تحديث
+          form:
+            registration_email_help: سيظهر هذا النص في منتصف البريد الإلكتروني الخاص بتأكيد التسجيل مباشرة بعد رمز التسجيل.
           index:
             title: اجتماعات
           new:
@@ -334,6 +344,8 @@ ar:
         filters:
           category: الفئة
           date: تاريخ
+          origin_values:
+            citizens: المواطنون
           search: بحث
         filters_small_view:
           close_modal: إغلاق مشروط

data/config/locales/ca.yml

@@ -100,7 +100,7 @@ ca:
           type_eq:
             label: Tipus de trobada
             values:
-              hybrid: Ambdues
+              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

@@ -35,7 +35,7 @@ cs:
         registration_terms: Podmínky registrace
         registration_url: URL registrace
         registrations_enabled: Registrace povoleny
-        show_embedded_iframe: Zobrazit vloženou iframe pro tuto URL
+        show_embedded_iframe: Zobrazit vložený iframe pro tuto URL
         start_time: Čas zahájení
         title: Název
         transparent: Transparentní
@@ -106,7 +106,7 @@ cs:
           type_eq:
             label: Typ schůzky
             values:
-              hybrid: Obojí
+              hybrid: Hybridní
               in_person: Osobně
               online: Online
       meeting_copies:
@@ -164,7 +164,7 @@ cs:
         meeting_registration_confirmed:
           notification_title: Vaše registrace pro schůzku <a href="%{resource_url}">%{resource_title}</a> byla potvrzena. Váš registrační kód je %{registration_code}.
         meeting_registrations_over_percentage:
-          email_intro: Počet schůzek obsazených schůzem "%{resource_title}" je vyšší než %{percentage}%.
+          email_intro: Přidělených míst pro schůzku "%{resource_title}" je více než %{percentage}%.
           email_outro: Toto oznámení jste obdrželi, protože jste administrátor participačního prostoru schůzky.
           email_subject: Schůzky obsazené schůzkou "%{resource_title}" jsou nad %{percentage}%
           notification_title: Počet obsazených slotů <a href="%{resource_path}">%{resource_title}</a> je vyšší než %{percentage}%.
@@ -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 smíšené.
     gamification:
       badges:
         attended_meetings:
@@ -228,7 +228,7 @@ cs:
           agenda_item:
             add_agenda_item_child: Přidání položky agendy dítěte
             agenda_item: Položka agendy
-            agenda_item_children: Agenda Item Childs
+            agenda_item_children: Dílčí body programu
             down: Dolů
             remove: Odstranit
             up: Nahoru
@@ -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: