decidim-meetings 0.31.6 → 0.31.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70eae741cc56bc63c12aa68a015da6047d208b1f75ddcebe212ee43affb150f2
-  data.tar.gz: 71edbdbb76dfd78b06b71a88f6ace88788aa886182f2bb7667cf3d676b750737
+  metadata.gz: e897fff27ccb0638be49d2b715babbc69d305fb7ba3982e081908d9fcd1b34d8
+  data.tar.gz: 329071b0ef486cdd1bcad21b4c3d003c681e666a1ede2b7762dbb96b3f526a82
 SHA512:
-  metadata.gz: c2a7c95a26291d7289ca4a1fed3cf4276f75d6ac3cfa51b31a8aabf595892cf49db9f5fad31d2d9580d24b4aa41aa8815c26d277d4b795eefbda0b87559e9624
-  data.tar.gz: 8652904969bf27e943cfb57ea1f73118960c5ebc26a9a84bb70e75184cd26038024fa3ed9f55cfbf7cfc8ef97485f58f423fbacde95f73d0e100c24046c1b4b9
+  metadata.gz: cdc2c8995712f405c8f2f5fbfa7462fd24ff2070c3c6749e3e6247cc3892573d37531753844f475ff76cba6ba5d013ed14416f99bf3b48bd53a7ff1bf3a47073
+  data.tar.gz: c72b045dd0cea7d9411bf4cd0eab36d8a09fea67450a7d8fc8c60eb81e9467b84df7f3029b833a065358c89cd351ef89fcb112b56ae02f65cd2d72249f3e3fbd

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/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/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/_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/cs.yml

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

@@ -144,6 +144,7 @@ de:
           success: Veranstaltung erfolgreich dupliziert.
         new:
           copy: Kopieren
+          title: Veranstaltung duplizieren
       tooltips:
         cannot_close_meetings: Diese Veranstaltung kann nicht abgeschlossen werden, da sie von einem Teilnehmenden erstellt wurde
         cannot_duplicate_meetings: Dieses Meeting kann nicht dupliziert werden, da es von einem Teilnehmenden erstellt wurde
@@ -166,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.
@@ -350,6 +352,7 @@ de:
             non_user: Nicht existierender Benutzer
             select_user: Nutzer wählen
           index:
+            invite_attendee: Teilnehmende einladen
             invites: Lädt ein
             registrations_disabled: Sie können keine Teilnehmende einladen, weil Registrierungen deaktiviert sind.
         meeting_closes:
@@ -804,7 +807,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