decidim-meetings 0.32.0 → 0.32.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2bce4805dd0febb7c55b8beecf3313a3716c1b686d0bde5ae025cd3fbb9ad65
-  data.tar.gz: 52089a3f97b12841149790d927431262dac3a8ad45badf8481df716eabc3920f
+  metadata.gz: 427b03e226543473dfa00cbe1aa7e2c503ae7531fd6c272ec085de605b53c17c
+  data.tar.gz: 42c90e2f58ff29ee2270d1dc7e898c697101c0fd255f5f175db6d51523f7d183
 SHA512:
-  metadata.gz: a1124e09ce4f911c0d6633760de6399828d1263f6d125bd0d05aceb7c866b16f2841fd785ffce44530291157f1c74888c68505edbac10dd01632ee5c66473e42
-  data.tar.gz: bce130537f035c9f40204dc96fae1adc41a78bdec6962fcd08f1766ee33cfe60cfd2ec2a6e40648697c3fe70f5d110f28d6612549ecee0bbf7d5a76fb57b7737
+  metadata.gz: 47e0476e08e50ab3c87515d7925e055a4adcdcd9d039df26ec2e10837ff1c22fa6a9f2ea42b8f79fc5d5eff827ba567b5a80a5c2ed77f3499cb263010df56164
+  data.tar.gz: a252d1f71ad7dd4ce63b878b3f202ea1524fd40817c69733c64a22c86e01aca940ee93fc34318b2c7295eac076241a0b98552b8a7859fe1f0fd1b3736adafd96

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

@@ -39,7 +39,7 @@ module Decidim
 
         def copy_meeting!
           parsed_title = Decidim::ContentProcessor.parse(form.title, current_organization: meeting.organization).rewrite
-          parsed_description = Decidim::ContentProcessor.parse_with_processor(:inline_images, form.description, current_organization: meeting.organization).rewrite
+          parsed_description = Decidim::ContentProcessor.parse(form.description, current_organization: meeting.organization).rewrite
 
           @copied_meeting = Decidim.traceability.create!(
             Meeting,

data/app/controllers/decidim/meetings/admin/attachment_collections_controller.rb

@@ -8,6 +8,8 @@ module Decidim
       class AttachmentCollectionsController < Admin::ApplicationController
         include Decidim::Admin::Concerns::HasAttachmentCollections
 
+        protected
+
         def after_destroy_path
           meeting_attachment_collections_path(meeting, meeting.component, current_participatory_space)
         end

data/app/controllers/decidim/meetings/admin/attachments_controller.rb

@@ -9,6 +9,8 @@ module Decidim
       class AttachmentsController < Decidim::Meetings::Admin::ApplicationController
         include Decidim::Admin::Concerns::HasAttachments
 
+        protected
+
         def after_destroy_path
           meetings_path
         end

data/app/controllers/decidim/meetings/admin/meetings_poll_controller.rb

@@ -52,11 +52,13 @@ module Decidim
           end
         end
 
+        protected
+
         def response_options
           respond_to do |format|
             format.json do
               question_id = params["id"]
-              question = Decidim::Meetings::Question.find_by(id: question_id)
+              question = questionnaire.questions.find_by(id: question_id)
               render json: question.response_options.map { |response_option| ResponseOptionPresenter.new(response_option).as_json } if question.present?
             end
           end
@@ -81,7 +83,7 @@ module Decidim
         private
 
         def questionnaire
-          @questionnaire ||= Decidim::Meetings::Questionnaire.find_or_initialize_by(questionnaire_for:)
+          @questionnaire ||= poll.questionnaire || Decidim::Meetings::Questionnaire.new(questionnaire_for:)
         end
 
         def blank_question
@@ -111,7 +113,7 @@ module Decidim
         end
 
         def poll
-          @poll ||= Poll.find_or_initialize_by(meeting:)
+          @poll ||= meeting.poll || Decidim::Meetings::Poll.new(meeting:)
         end
       end
     end

data/app/controllers/decidim/meetings/admin/registration_form_controller.rb

@@ -7,6 +7,8 @@ module Decidim
       class RegistrationFormController < Admin::ApplicationController
         include Decidim::Forms::Admin::Concerns::HasQuestionnaire
 
+        protected
+
         def questionnaire_for
           meeting
         end
@@ -27,6 +29,10 @@ module Decidim
           "decidim/meetings/admin/registration_form/edit_questions"
         end
 
+        def response_options_url(params)
+          url_for(params.merge(controller: "registration_form", action: "response_options", format: :json, meeting_id: meeting.id))
+        end
+
         private
 
         def i18n_questions_flashes_scope

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

@@ -14,10 +14,14 @@ module Decidim
       skip_around_action :use_organization_time_zone
 
       def show
+        enforce_permission_to :read, :calendar
+
         render plain: CalendarRenderer.for(current_component, filter_params), content_type: "type/calendar"
       end
 
       def meeting_calendar
+        enforce_permission_to(:read, :meeting, meeting:)
+
         send_data CalendarRenderer.for(meeting), content_type: "type/calendar", filename: "#{meeting.reference}.ics"
       end
 

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

@@ -17,6 +17,8 @@ module Decidim
         helper_method :meetings, :search
 
         def calendar
+          enforce_permission_to :read, :calendar
+
           render plain: CalendarRenderer.for(current_organization, filter_params), content_type: "type/calendar"
         end
 

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

@@ -14,6 +14,8 @@ module Decidim
       def show
         raise ActionController::RoutingError, "Not Found" unless meeting
 
+        enforce_permission_to(:read, :meeting, meeting:)
+
         return if allowed_for_current_user?
 
         flash[:alert] = I18n.t("meeting.not_allowed", scope: "decidim.meetings")

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

@@ -48,6 +48,8 @@ module Decidim
       end
 
       def index
+        enforce_permission_to :read, :meeting
+
         return unless search.result.blank? && params.dig("filter", "date") != %w(past)
 
         @past_meetings ||= search_with(filter_params.merge(with_any_date: %w(past)))
@@ -206,6 +208,7 @@ module Decidim
         return unless params[:previous_space]
 
         previous_space_class, previous_space_id = params[:previous_space].split("#")
+        return unless valid_participatory_space_class?(previous_space_class)
 
         @previous_space = previous_space_class.constantize.find_by(id: previous_space_id)
         @previous_space
@@ -213,6 +216,14 @@ module Decidim
         nil
       end
 
+      def valid_participatory_space_class?(class_name)
+        return false if class_name.blank?
+
+        Decidim.participatory_space_manifests.any? do |manifest|
+          manifest.model_class_name == class_name
+        end
+      end
+
       def conference_context?
         return false unless Decidim.module_installed?(:conferences)
         return false if current_participatory_space.blank?

data/app/controllers/decidim/meetings/polls/questions_controller.rb

@@ -7,6 +7,8 @@ module Decidim
         include Decidim::Meetings::PollsResources
 
         def index
+          enforce_permission_to(:read, :meeting, meeting:)
+
           respond_to do |format|
             format.js do
               render template: pick_index_template, locals: { open_question: nil }

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

@@ -100,9 +100,7 @@ module Decidim
         end
       end
 
-      def should_join_waitlist?
-        meeting.waitlist_enabled? && !meeting.has_available_slots? && !meeting.has_registration_for?(current_user)
-      end
+      protected
 
       def allow_responses?
         return false unless meeting.registrations_enabled? && meeting.registration_form_enabled?
@@ -126,6 +124,10 @@ module Decidim
 
       private
 
+      def should_join_waitlist?
+        meeting.waitlist_enabled? && !meeting.has_available_slots? && !meeting.has_registration_for?(current_user)
+      end
+
       def meeting
         @meeting ||= Meeting.where(component: current_component).find(params[:meeting_id])
       end

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

@@ -6,6 +6,8 @@ module Decidim
     class VersionsController < Decidim::Meetings::ApplicationController
       include Decidim::ResourceVersionsConcern
 
+      private
+
       def versioned_resource
         @versioned_resource ||= Meeting.not_hidden.where(component: current_component).find(params[:meeting_id])
       end

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

@@ -35,12 +35,12 @@ module Decidim
         end
 
         def agenda_duration
-          @agenda_duration ||= agenda_items.sum(&:duration)
+          @agenda_duration ||= agenda_items.reject(&:deleted?).sum(&:duration)
         end
 
         def agenda_items_duration_too_long
-          agenda_items.each do |agenda_item|
-            children_duration = agenda_item.agenda_item_children.sum(&:duration)
+          agenda_items.reject(&:deleted?).each do |agenda_item|
+            children_duration = agenda_item.agenda_item_children.reject(&:deleted?).sum(&:duration)
 
             if children_duration > agenda_item.duration
               difference = children_duration - agenda_item.duration

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

@@ -40,7 +40,11 @@ module Decidim
       def map_model(model)
         presenter = MeetingEditionPresenter.new(model)
         self.title = presenter.title(all_locales: false)
-        self.description = presenter.editor_description(all_locales: false)
+        self.description = if model.component.organization.rich_text_editor_in_public_views?
+                             presenter.editor_description(all_locales: false)
+                           else
+                             presenter.plain_locales(model.description, false)
+                           end
         self.location = presenter.location(all_locales: false)
         self.location_hints = presenter.location_hints(all_locales: false)
         self.registration_terms = presenter.registration_terms(all_locales: false)

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

@@ -140,7 +140,7 @@ module Decidim
 
       scope :visible, -> { where("decidim_meetings_meetings.private_meeting != ? OR decidim_meetings_meetings.transparent = ?", true, true) }
 
-      scope :authored_by, ->(author) { where(decidim_author_id: author) }
+      scope :authored_by, ->(author) { where(author:) }
 
       scope_search_multi :with_any_type, TYPE_OF_MEETING.keys
 

data/app/permissions/decidim/meetings/meeting_permissions.rb

@@ -10,7 +10,9 @@ module Decidim
       def target_subject = :meeting
 
       def can_read?
-        user_has_any_role?(user, meeting.participatory_space, broad_check: true) || (!meeting&.hidden? && meeting&.current_user_can_visit_meeting?(user))
+        return true if meeting.nil?
+
+        user_has_any_role?(user, meeting.participatory_space, broad_check: true) || (!meeting.hidden? && meeting.current_user_can_visit_meeting?(user))
       end
 
       def meeting

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

@@ -4,26 +4,26 @@
 </button>
 
 <%= decidim_modal id: "calendarShare", class: "meeting-list__modal" do %>
-<div class="meeting-list__modal-title">
-  <%= icon "share-forward-2-line", class: "w-6 h-6 text-gray fill-current flex-none" %>
-  <div class="space-y-8">
-    <h3 id="dialog-title-calendarShare" class="h3"><%= t(".calendar_url") %></h3>
+  <div data-dialog-container>
+    <%= icon "share-forward-2-line" %>
+    <h2 id="dialog-title-calendarShare" tabindex="-1" data-dialog-title><%= t(".calendar_url") %></h2>
 
-    <p id="dialog-desc-calendarShare" class="meeting-list__modal-text"><%= t(".copy_calendar_url_description") %></p>
-    <p class="meeting-list__modal-text"><%= t(".copy_calendar_url_explanation") %></p>
+    <div class="space-y-8">
+      <p id="dialog-desc-calendarShare" class="meeting-list__modal-text"><%= t(".copy_calendar_url_description") %></p>
+      <p class="meeting-list__modal-text"><%= t(".copy_calendar_url_explanation") %></p>
 
-    <div class="meeting-list__modal-input">
-      <input id="urlCalendarUrl" type="text" title="<%= t(".calendar_url") %>" value="<%= "#{path}" %>" readonly>
-      <button
-        data-controller="clipboard-copy"
-        data-clipboard-copy="#urlCalendarUrl"
-        data-clipboard-copy-label="<%= t(".copy_calendar_url_copied") %>"
-        data-clipboard-copy-message="<%= t(".copy_calendar_url_message") %>"
-        aria-label="<%= t(".copy_calendar_url_clarification") %>">
-        <%= icon "file-copy-line", class: "w-5 h-6 text-secondary fill-current" %>
-        <span class="sr-only"><%= t(".copy_calendar_url") %></span>
-      </button>
+      <div class="meeting-list__modal-input">
+        <input id="urlCalendarUrl" type="text" title="<%= t(".calendar_url") %>" value="<%= "#{path}" %>" readonly>
+        <button
+          data-controller="clipboard-copy"
+          data-clipboard-copy="#urlCalendarUrl"
+          data-clipboard-copy-label="<%= t(".copy_calendar_url_copied") %>"
+          data-clipboard-copy-message="<%= t(".copy_calendar_url_message") %>"
+          aria-label="<%= t(".copy_calendar_url_clarification") %>">
+          <%= icon "file-copy-line" %>
+          <span class="sr-only"><%= t(".copy_calendar_url") %></span>
+        </button>
+      </div>
     </div>
   </div>
-</div>
 <% end %>

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

@@ -6,7 +6,7 @@
       </div>
 
       <div class="row column">
-        <%= form.translated :editor, :description, resource_mentionable: true, aria: { label: :description } %>
+        <%= form.translated :editor, :description, mentionable: true, resource_mentionable: true, aria: { label: :description } %>
       </div>
 
       <div class="row column">

data/app/views/decidim/meetings/admin/poll/_question.html.erb

@@ -14,7 +14,7 @@
         </span>
 
         <span class="ml-auto flex flex-row-reverse items-center gap-2">
-          <button id="<%= id %>-button" type="button" class="question--collapse <%= "question-error" if is_expanded %>" data-controls="panel-<%= id %>-question-card">
+          <button id="<%= id %>-button" type="button" class="question--collapse" data-controls="panel-<%= id %>-question-card" data-open="<%= is_expanded %>">
             <span class="icon-collapse">
               <%== icon "arrow-up-s-line", aria_label: t("collapse", scope: "decidim.forms.admin.questionnaires.question"), role: "img" %>
             </span>

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

@@ -3,7 +3,7 @@
 </div>
 
 <div>
-  <%= text_editor_for(form, :description) %>
+  <%= text_editor_for(form, :description, mentionable: true, data: { controller: "mention", search_prompt: t("decidim.shared.mentions.search_prompt") }) %>
 </div>
 
 <div>

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

@@ -2,7 +2,7 @@
   <div data-dialog-container>
     <div data-dialog-title>
       <%= icon "qr-code-line" %>
-      <h2 class="h4" tabindex="-1"><%= t("registration_and_qr_code", scope: "decidim.meetings.meetings.show") %></h2>
+      <h2 id="dialog-title-registration-qr-code-dialog" class="h4" tabindex="-1"><%= t("registration_and_qr_code", scope: "decidim.meetings.meetings.show") %></h2>
     </div>
     <div class="content">
       <div>

data/config/locales/ca.yml

@@ -439,7 +439,7 @@ ca:
             success: Enquesta actualitzada correctament.
         poll:
           edit:
-            title: Edita l'enquesta
+            title: Editar l'enquesta
           form:
             announcement_html:
             - Quan una pregunta rep respostes o està publicada/tancada, ja no es pot seguir editant.
@@ -448,7 +448,7 @@ ca:
             - Visita la <a href='%{admin_link}'>pàgina d'administració d'enquestes</a> per enviar preguntes i publicar resultats.
         registration_form:
           edit_questions:
-            title: Edita les preguntes
+            title: Editar les preguntes
         registrations:
           edit:
             save: Desa

data/config/locales/cs.yml

@@ -172,6 +172,7 @@ cs:
             announcement: Oznámení
             clear_all: Vymazat vše
             comments_enabled: Komentáře povoleny
+            comments_max_length: Maximální počet znaků na komentář (ponechte 0 pro výchozí hodnotu)
             creation_enabled_for_participants: Účastníci mohou vytvářet schůzky
             default_registration_terms: Výchozí podmínky registrace
             define_taxonomy_filters: Před použitím tohoto nastavení prosím definujte některé filtry pro tento participační prostor.

data/config/locales/de.yml

@@ -167,6 +167,7 @@ de:
             announcement: Ankündigung
             clear_all: Alles löschen
             comments_enabled: Kommentare aktiviert
+            comments_max_length: Maximale Zeichenanzahl pro Kommentar (0 für Standardwert)
             creation_enabled_for_participants: Teilnehmende können Veranstaltungen erstellen
             default_registration_terms: Standard-Registrierungsbedingungen
             define_taxonomy_filters: Bitte definieren Sie einige Filter für diesen partizipativen Bereich, bevor Sie diese Einstellung verwenden.
@@ -353,10 +354,14 @@ de:
           index:
             invites: Lädt ein
             registrations_disabled: Sie können keine Teilnehmende einladen, weil Registrierungen deaktiviert sind.
+            title: Teilnehmende einladen
         meeting_closes:
           edit:
             close: Schließen
             title: Veranstaltung abschliessen
+        meeting_copies:
+          new:
+            title: Veranstaltung duplizieren
         meetings:
           close:
             invalid: Beim Abschliessen dieser Veranstaltung ist ein Problem aufgetreten.
@@ -389,6 +394,7 @@ de:
             assign: Zuweisen
             link_a_space: Bereich verknüpfen
             private_meeting_warning: Verknüpfte Bereiche werden nicht angewendet, wenn die Veranstaltung privat und nicht transparent ist.
+            restricted_space_warning: Verknüpfte Bereiche werden nicht angewendet, wenn die Veranstaltung zu einem eingeschränkten Bereich gehört.
             select: Einen Bereich auswählen
             table:
               actions: Aktionen
@@ -432,15 +438,21 @@ de:
             invalid: Beim Aktualisieren der Veranstaltungsumfrage ist ein Problem aufgetreten.
             success: Veranstaltungsumfrage erfolgreich aktualisiert.
         poll:
+          edit:
+            title: Umfrage bearbeiten
           form:
             announcement_html:
             - Wenn eine Frage Antworten erhalten hat oder veröffentlicht/geschlossen wird, kann sie nicht mehr bearbeitet werden.
             - Sie können jederzeit eine neue Frage hinzufügen.
             - Die Umfrage wird geschlossen, wenn die Ergebnisse aller erstellten Fragen veröffentlicht wurden.
             - Besuchen Sie die <a href='%{admin_link}'>Umfrageverwaltungsseite</a> um Fragen zu versenden oder Ergebnisse zu veröffentlichen.
+        registration_form:
+          edit_questions:
+            title: Fragen bearbeiten
         registrations:
           edit:
             save: Speichern
+            title: Anmeldungen
           form:
             available_slots_help: Belassen Sie es auf 0, wenn Sie unbegrenzte Plätze zur Verfügung haben.
             invites: Lädt ein
@@ -804,7 +816,7 @@ de:
           longitude: Der Längengrad des Veranstaltungsorts
           online_meeting_url: Die URL der Online-Veranstaltung
           organizations: Die Organisationen, die an dieser Veranstaltung teilnehmen
-          participatory_space: Zu welchem Bereich diese Veranstaltung gehört (z.B. Beteiligungsprozesse oder Gremien)
+          participatory_space: Zu welchem Bereich diese Veranstaltung gehört (z.B. Beteiligungsprozesse oder Versammlungen)
           private_meeting: Um anzugeben, ob die Veranstaltung privat ist oder nicht
           published: Wann die Veranstaltung veröffentlicht wurde
           reference: Die eindeutige Bezeichnung der Ressource auf dieser Plattform

data/config/locales/es.yml

@@ -394,7 +394,7 @@ es:
             assign: Asignar
             link_a_space: Vincular un espacio
             private_meeting_warning: Los espacios enlazados no se aplicarán si la reunión es privada y no transparente.
-            restricted_space_warning: Los espacios enlazados no se aplicarán cuando el encuentro pertenezca a un espacio restringido no transparente.
+            restricted_space_warning: Los espacios enlazados no se aplicarán cuando el encuentro pertenezca a un espacio restringido.
             select: Selecciona un espacio
             table:
               actions: Acciones