decidim-meetings 0.26.5 → 0.27.0.rc1

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

@@ -102,9 +102,7 @@ $(() => {
     attachGeocoding($form.find("#meeting_address"));
 
     const $meetingRegistrationType = $form.find("#meeting_registration_type");
-    const $meetingRegistrationTerms = $form.find("#meeting_registration_terms");
     const $meetingRegistrationUrl = $form.find("#meeting_registration_url");
-    const $meetingAvailableSlots = $form.find("#meeting_available_slots");
 
     const toggleDependsOnSelect = ($target, $showDiv, type) => {
       const value = $target.val();
@@ -113,8 +111,6 @@ $(() => {
 
     $meetingRegistrationType.on("change", (ev) => {
       const $target = $(ev.target);
-      toggleDependsOnSelect($target, $meetingAvailableSlots, "on_this_platform");
-      toggleDependsOnSelect($target, $meetingRegistrationTerms, "on_this_platform");
       toggleDependsOnSelect($target, $meetingRegistrationUrl, "on_different_platform");
     });
 

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

@@ -5,11 +5,13 @@ $(() => {
     const $registrationsEnabled = $form.find("#meeting_registrations_enabled");
     const $availableSlots = $form.find("#meeting_available_slots");
     const $reservedSlots = $form.find("#meeting_reserved_slots");
+    const $customizeRegistrationEmail = $form.find("#meeting_customize_registration_email");
 
     const toggleDisabledFields = () => {
       const enabled = $registrationsEnabled.prop("checked");
       $availableSlots.attr("disabled", !enabled);
       $reservedSlots.attr("disabled", !enabled);
+      $customizeRegistrationEmail.attr("disabled", !enabled);
 
       $form.find(".editor-container").each((idx, node) => {
         const quill = Quill.find(node);

data/app/presenters/decidim/meetings/admin_log/questionnaire_presenter.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Meetings::Questionnaire`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    QuestionnairePresenter.new(action_log, view_helpers).present
+      class QuestionnairePresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "update"
+            "decidim.meetings.admin_log.questionnaire.#{action}"
+          else
+            super
+          end
+        end
+
+        def resource_presenter
+          @resource_presenter ||= Decidim::Log::ResourcePresenter.new(action_log.resource.questionnaire_for.meeting, h, action_log.resource.questionnaire_for.meeting)
+        end
+
+        def i18n_params
+          super.merge(
+            meeting_name: resource_presenter.try(:present)
+          )
+        end
+      end
+    end
+  end
+end

data/app/queries/decidim/meetings/admin/invites.rb

@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     module Admin
       # A class used to find the Invites by their status status.
-      class Invites < Rectify::Query
+      class Invites < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # invites - the initial Invites relation that needs to be filtered.

data/app/queries/decidim/meetings/filtered_meetings.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # A class used to find meetings filtered by components and a date range
-    class FilteredMeetings < Rectify::Query
+    class FilteredMeetings < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # components - An array of Decidim::Component

data/app/queries/decidim/meetings/questionnaire_user_answers.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # A class used to collect user answers for a questionnaire
-    class QuestionnaireUserAnswers < Rectify::Query
+    class QuestionnaireUserAnswers < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # questionnaire - a Questionnaire object

data/app/serializers/decidim/meetings/{data_portability_invite_serializer.rb → download_your_data_invite_serializer.rb}

@@ -2,8 +2,8 @@
 
 module Decidim
   module Meetings
-    class DataPortabilityInviteSerializer < Decidim::Exporters::Serializer
-      # Serializes an invite for data portability
+    class DownloadYourDataInviteSerializer < Decidim::Exporters::Serializer
+      # Serializes an invite for download your data
       def serialize
         {
           id: resource.id,

data/app/serializers/decidim/meetings/{data_portability_registration_serializer.rb → download_your_data_registration_serializer.rb}

@@ -2,8 +2,8 @@
 
 module Decidim
   module Meetings
-    class DataPortabilityRegistrationSerializer < Decidim::Exporters::Serializer
-      # Serializes a registration for data portability
+    class DownloadYourDataRegistrationSerializer < Decidim::Exporters::Serializer
+      # Serializes a registration for download your data
       def serialize
         {
           id: resource.id,

data/app/services/decidim/meetings/calendar/base_calendar.rb

@@ -14,15 +14,16 @@ module Decidim
         # resource - a resource that has meetings.
         #
         # Returns a String.
-        def self.for(resource)
-          new(resource).calendar
+        def self.for(resource, filters = nil)
+          new(resource, filters).calendar
         end
 
         # Initializes the class.
         #
         # resource - a resource that has meetings.
-        def initialize(resource)
+        def initialize(resource, filters = nil)
           @resource = resource
+          @filters = filters
         end
 
         # Converts the resource meetings to the ICalendar format.

data/app/services/decidim/meetings/calendar/component_calendar.rb

@@ -11,11 +11,9 @@ module Decidim
         #
         # Returns a String.
         def events
-          Rails.cache.fetch(cache_key) do
-            meetings.map do |meeting|
-              MeetingCalendar.new(meeting).events
-            end.compact.join
-          end
+          filtered_meetings.map do |meeting|
+            MeetingCalendar.new(meeting).events
+          end.compact.join
         end
 
         private
@@ -29,11 +27,11 @@ module Decidim
           Decidim::Meetings::Meeting.where(component: component)
         end
 
-        # Defines the cache key for the given component.
+        # Finds the component meetings.
         #
-        # Returns a String.
-        def cache_key
-          "meetings-calendar-component-#{component.id}-#{component.updated_at.to_i}"
+        # Returns a collection of Meetings filtered based on provided params.
+        def filtered_meetings
+          meetings.not_hidden.published.except_withdrawn.ransack(@filters).result
         end
       end
     end

data/app/services/decidim/meetings/calendar/organization_calendar.rb

@@ -13,7 +13,7 @@ module Decidim
         # Returns a String.
         def events
           @events ||= components.map do |component|
-            ComponentCalendar.new(component).events
+            ComponentCalendar.new(component, @filters).events
           end.compact.join
         end
 

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

@@ -3,14 +3,14 @@
 module Decidim
   module Meetings
     class CalendarRenderer
-      def self.for(resource)
+      def self.for(resource, filters = nil)
         case resource
         when Decidim::Organization
-          Calendar::OrganizationCalendar.for(resource)
+          Calendar::OrganizationCalendar.for(resource, filters)
         when Decidim::Component
-          Calendar::ComponentCalendar.for(resource)
+          Calendar::ComponentCalendar.for(resource, filters)
         when Decidim::Meetings::Meeting
-          Calendar::MeetingCalendar.for(resource)
+          Calendar::MeetingCalendar.for(resource, filters)
         end
       end
     end

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

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This class is the generator class which creates and updates meetings related reminders,
+    # after reminder is generated it is send to user who have not closed past meetings.
+    class CloseMeetingReminderGenerator
+      attr_reader :reminder_jobs_queued
+
+      def initialize
+        @reminder_manifest = Decidim.reminders_registry.for(:close_meeting)
+        @reminder_jobs_queued = 0
+      end
+
+      # Creates reminders and updates them if they already exists.
+      def generate
+        Decidim::Component.where(manifest_name: "meetings").published.each do |component|
+          send_reminders(component)
+        end
+      end
+
+      private
+
+      attr_reader :reminder_manifest
+
+      def finder_query(component_id, interval)
+        Decidim::Meetings::Meeting
+          .published
+          .not_hidden
+          .except_withdrawn
+          .where(
+            "decidim_component_id = ? AND end_time >= ? AND end_time <= ? AND closed_at IS NULL",
+            component_id,
+            interval.ago.beginning_of_day,
+            interval.ago.end_of_day
+          )
+      end
+
+      def send_reminders(component)
+        intervals = Array(reminder_manifest.settings.attributes[:reminder_times].default)
+        space_admins = Decidim::ParticipatoryProcessUserRole.where(decidim_participatory_process_id: component.participatory_space_id, role: "admin").collect(&:user)
+        space_admins = (global_admins + space_admins).uniq
+        intervals.each do |interval|
+          finder_query(component.id, interval).find_each do |meeting|
+            authors = meeting.official? ? space_admins : [meeting.author]
+            authors.each do |author|
+              send_notif = author.notification_settings.fetch("close_meeting_reminder", "1")
+              next unless send_notif == "1"
+
+              reminder = Decidim::Reminder.find_or_create_by(user: author, component: component)
+              record = Decidim::ReminderRecord.find_or_create_by(reminder: reminder, remindable: meeting)
+              record.update(state: "active") unless record.active?
+              reminder.records << record
+              reminder.save!
+
+              Decidim::Meetings::SendCloseMeetingReminderJob.perform_later(record)
+              @reminder_jobs_queued += 1
+            end
+          end
+        end
+      end
+
+      def global_admins
+        @global_admins ||= Decidim::User.where(admin: true).all
+      end
+    end
+  end
+end

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

@@ -30,28 +30,31 @@ module Decidim
       def embeddable?
         return nil if parsed_online_meeting_uri.nil?
 
-        EMBEDDABLE_SERVICES.include?(parsed_online_meeting_uri.host)
+        embeddable_services.include?(parsed_online_meeting_uri.host)
       end
 
       def embed_code(request_host)
         return nil if parsed_online_meeting_uri.nil?
 
         %(
-<iframe
+<div
+  class="disabled-iframe"
   allow="camera; microphone; fullscreen; display-capture; autoplay"
   loading="lazy"
   src="#{embed_transformed_url(request_host)}"
   style="height: 100%; width: 100%; border: 0px;"
-></iframe>
+></div>
         )
       end
 
       private
 
-      EMBEDDABLE_SERVICES = %( www.youtube.com www.twitch.tv meet.jit.si )
-
       attr_accessor :online_meeting_service_url
 
+      def embeddable_services
+        @embeddable_services ||= Meetings.embeddable_services
+      end
+
       # Youtube transformation consists on:
       # 1. extract the video id from the parameter v
       # 2. Create a new URL using the domain youtube-nocookie.com, converting it to an embed
@@ -59,7 +62,8 @@ module Decidim
       def transform_youtube_url(uri)
         return online_meeting_service_url if uri.query.blank?
 
-        video_id = CGI.parse(uri.query).fetch("v")&.first
+        parsed_query = CGI.parse(uri.query)
+        video_id = parsed_query.has_key?("v") ? CGI.parse(uri.query).fetch("v")&.first : nil
 
         return online_meeting_service_url if video_id.blank?
 

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

@@ -2,63 +2,17 @@
 
 module Decidim
   module Meetings
-    # This class handles search and filtering of meetings. Needs a
-    # `current_component` param with a `Decidim::Component` in order to
-    # find the meetings.
+    # This service scopes the meeting searches with parameters that cannot be
+    # passed from the user interface.
     class MeetingSearch < ResourceSearch
-      text_search_fields :title, :description
+      attr_reader :activity
 
-      # Public: Initializes the service.
-      # component     - A Decidim::Component to get the meetings from.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of meetings to return per page.
-      def initialize(options = {})
-        options[:scope] = options.fetch(:scope, Meeting.published)
-        options[:scope] = options[:state] == "withdrawn" ? options[:scope].withdrawn : options[:scope].except_withdrawn
-        options[:scope] = options[:scope].includes(:component, :attachments)
-        super(options[:scope], options)
-      end
-
-      # Handle the date filter
-      def search_date
-        apply_scopes(%w(upcoming past), date)
-      end
-
-      def search_space
-        return query if options[:space].blank? || options[:space] == "all"
-
-        query.joins(:component).where(decidim_components: { participatory_space_type: options[:space].classify })
-      end
+      def build(params)
+        @activity = params[:activity]
 
-      def search_type
-        fields = Decidim::Meetings::Meeting::TYPE_OF_MEETING
-        filtered = []
-        options[:type].each do |inquiry|
-          filtered.push(inquiry) if fields.include?(inquiry)
-        end
-        filtered.size.positive? ? query.where(decidim_meetings_meetings: { type_of_meeting: filtered }) : query
-      end
-
-      # Handle the activity filter
-      def search_activity
-        case activity
-        when "my_meetings"
-          query
-            .where(decidim_author_id: user.id)
-        else
-          query
-        end
-      end
-
-      # Handle the state filter
-      def search_state
-        return query.withdrawn if state == "withdrawn"
-
-        query.except_withdrawn
-      end
+        add_scope(:authored_by, user) if params[:activity] == "my_meetings" && user
 
-      def results
-        super.includes(attachments: :file_attachment, component: { participatory_space: :organization })
+        super
       end
     end
   end

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

@@ -2,12 +2,29 @@
   <%= t(".export_calendar") %>
   <%= icon "share", class: "icon--after", role: "img", "aria-hidden": true %>
 </button>
+
 <div class="reveal" id="calendarShare" data-reveal>
   <div class="reveal__header">
-    <h2 class="reveal__title"><%= t(".calendar_url") %>:</h2>
+    <h3 class="reveal__title"><%= t(".calendar_url") %>:</h3>
     <button class="close-button" data-close aria-label="<%= t(".close_window") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
-  <input type="text" value="<%= "#{path}" %>" readonly title="<%= t(".calendar_url") %>">
+
+  <div class="calendar-url-description"><%= t(".copy_calendar_url_description") %></div>
+  <div class="calendar-url-explanation"><%= t(".copy_calendar_url_explanation") %></div>
+
+  <div class="input-group calendar_url_input">
+    <input id="urlCalendarUrl" class="input-group-field" type="text" title="<%= t(".calendar_url") %>" value="<%= "#{path}" %>" readonly>
+    <div class="input-group-button">
+      <button class="button primary"
+              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 "clipboard", role: "img", "aria-hidden": true %>
+        <%= t(".copy_calendar_url") %>
+      </button>
+    </div>
+  </div>
 </div>

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

@@ -0,0 +1,64 @@
+<div class="card" id="meetings">
+  <div class="card-divider">
+    <h2 class="card-title"><%= title %></h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column hashtags__container">
+      <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true, value: @meeting.present? ? present(@meeting).title(all_locales: true) : @form.title.with_indifferent_access %>
+    </div>
+
+    <div class="row column hashtags__container">
+      <%= form.translated :editor, :description, hashtaggable: true, value: @meeting.present? ? present(@meeting).description(all_locales: true) : @form.description.with_indifferent_access %>
+    </div>
+
+    <div class="row column">
+      <%= form.select :type_of_meeting,
+                      @form.type_of_meeting_select,
+                      { include_blank: t(".select_a_meeting_type") },
+                      { multiple: false } %>
+    </div>
+
+    <div class="row column field" data-meeting-type="in_person">
+      <%= form.geocoding_field :address %>
+    </div>
+
+    <div class="row column field" data-meeting-type="in_person">
+      <%= form.translated :text_area, :location %>
+    </div>
+
+    <div class="row column">
+      <%= form.translated :text_area, :location_hints %>
+    </div>
+
+    <div class="row column field" data-meeting-type="online">
+      <%= form.text_field :online_meeting_url %>
+    </div>
+
+    <div class="row column field" data-meeting-type="online">
+      <%= form.check_box :show_embedded_iframe %>
+    </div>
+
+    <div class="row">
+      <div class="columns xlarge-6">
+        <%= form.datetime_field :start_time %>
+      </div>
+
+      <div class="columns xlarge-6">
+        <%= form.datetime_field :end_time %>
+      </div>
+    </div>
+
+    <div class="row column" id="private_meeting">
+      <%= form.check_box :private_meeting %>
+    </div>
+
+    <div class="row column" id="transparent">
+      <%= form.check_box :transparent %>
+    </div>
+  </div>
+</div>
+
+<%= render "decidim/meetings/admin/meetings/services", form: form %>
+
+<%= javascript_pack_tag "decidim_meetings_admin" %>

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: "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") } %>
+  <%= render partial: "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

@@ -43,7 +43,7 @@
         <%= form.select :iframe_embed_type,
           @form.iframe_embed_type_select,
           { multiple: false } %>
-        <p class="help-text"><%= t(".show_embedded_iframe_help") %></p>
+        <p class="help-text"><%= t(".show_embedded_iframe_help", domains: Decidim::Meetings.embeddable_services&.join(" ")) %></p>
       </div>
 
       <div class="row column field iframe-fields--access-level" data-meeting-type="online-access-level">
@@ -82,15 +82,12 @@
         { multiple: false } %>
     </div>
 
-    <div class="row column" id="meeting_available_slots">
-      <%= form.number_field :available_slots %>
-      <p class="help-text"><%= t(".available_slots_help") %></p>
-    </div>
-
     <div class="field" id="meeting_registration_url">
       <%= form.text_field :registration_url %>
       <p class="help-text"><%= t(".registration_url_help") %></p>
-      <label><%= t(".disclaimer", organization: current_component.organization.name) %></label><br>
+      <div class="callout alert">
+        <%= t(".disclaimer", organization: current_component.organization.name) %>
+      </div>
     </div>
 
     <div class="row column" id="private_meeting">
@@ -101,19 +98,10 @@
       <%= form.check_box :transparent %>
     </div>
 
-    <div class="row column">
-      <%= form.check_box :customize_registration_email, :"data-toggle" => "customize_registration_email-div" %>
-    </div>
-
-    <div id="customize_registration_email-div" data-toggler=".hide" class="row column <%= @form.customize_registration_email? ? nil : "hide" %>">
-      <%= form.translated :editor, :registration_email_custom_content, lines: 10 %>
-      <p class="help-text"><%= t(".registration_email_help") %></p>
-    </div>
-
     <%= render partial: "decidim/comments/admin/shared/availability_fields", locals: { form: form } %>
   </div>
 </div>
 
-<%= render "decidim/meetings/admin/meetings/services", form: form, id: tabs_id_for_service(blank_service) %>
+<%= render "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(html_escape: true) %><br>
+                <%= present(meeting).title %><br>
               </td>
               <td>
                 <% if meeting.start_time %>

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

@@ -41,6 +41,15 @@
       <p class="help-text"><%= t(".reserved_slots_help") %></p>
     </div>
 
+    <div class="row column">
+      <%= form.check_box :customize_registration_email, :"data-toggle" => "customize_registration_email-div" %>
+    </div>
+
+    <div id="customize_registration_email-div" data-toggler=".hide" class="row column <%= @form.customize_registration_email? ? nil : "hide" %>">
+      <%= form.translated :editor, :registration_email_custom_content, lines: 10 %>
+      <p class="help-text"><%= t(".registration_email_help") %></p>
+    </div>
+
     <div class="row column">
       <%= form.translated :editor, :registration_terms %>
     </div>

data/app/views/decidim/meetings/close_meeting_reminder_mailer/close_meeting_reminder.html.erb

@@ -0,0 +1,5 @@
+<p class="email-greeting"><%= t "decidim.meetings.close_meeting_reminder_mailer.close_meeting_reminder.hello", username: @user.name %></p>
+
+<p class="email-instructions"><%= t("decidim.meetings.close_meeting_reminder_mailer.close_meeting_reminder.body", meeting_title: translated_attribute(@meeting.title), meeting_path: @meeting.reported_content_url).html_safe %></p>
+
+<p class="email-closing"><%= t("decidim.meetings.close_meeting_reminder_mailer.close_meeting_reminder.greetings", organization_name: h(@organization.name), organization_url: decidim.root_url(host: @organization.host)).html_safe %></p>

data/app/views/decidim/meetings/directory/meetings/_filters.html.erb

@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t("decidim.meetings.meetings.filters.search"), title: t("decidim.meetings.meetings.filters.search"), "aria-label": t("decidim.meetings.meetings.filters.search"), data: { disable_dynamic_change: true } %>
+        <%= form.search_field :title_or_description_cont, label: false, class: "input-group-field", placeholder: t("decidim.meetings.meetings.filters.search"), title: t("decidim.meetings.meetings.filters.search"), "aria-label": t("decidim.meetings.meetings.filters.search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="meetings">
             <%= icon "magnifying-glass", aria_label: t("decidim.meetings.meetings.filters.search"), role: "img" %>
@@ -15,18 +15,18 @@
   </div>
 
   <% unless @forced_past_meetings %>
-    <%= form.collection_radio_buttons :date, filter_date_values, :first, :last, legend_title: t("decidim.meetings.meetings.filters.date") %>
+    <%= form.check_boxes_tree :with_any_date, filter_date_values, 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") %>
+  <%= form.check_boxes_tree :with_any_type, filter_type_values, legend_title: t("decidim.meetings.meetings.filters.type") %>
 
-  <%= form.check_boxes_tree :scope_id, directory_filter_scopes_values, legend_title: t("decidim.meetings.meetings.filters.scope") %>
+  <%= form.check_boxes_tree :with_any_scope, directory_filter_scopes_values, legend_title: t("decidim.meetings.meetings.filters.scope") %>
 
-  <%= form.check_boxes_tree :category_id, directory_filter_categories_values, legend_title: t("decidim.meetings.meetings.filters.category") %>
+  <%= form.check_boxes_tree :with_any_global_category, directory_filter_categories_values, legend_title: t("decidim.meetings.meetings.filters.category") %>
 
-  <%= form.check_boxes_tree :origin, directory_filter_origin_values, legend_title: t("decidim.meetings.meetings.filters.origin") %>
+  <%= form.check_boxes_tree :with_any_origin, directory_filter_origin_values, legend_title: t("decidim.meetings.meetings.filters.origin") %>
 
-  <%= form.check_boxes_tree :space, directory_meeting_spaces_values, legend_title: t("decidim.meetings.directory.meetings.index.space_type") %>
+  <%= form.check_boxes_tree :with_any_space, directory_meeting_spaces_values, legend_title: t("decidim.meetings.directory.meetings.index.space_type") %>
 
   <% if current_user %>
     <%= form.collection_radio_buttons :activity, activity_filter_values, :first, :last, { legend_title: t("decidim.meetings.meetings.filters.activity") }, "aria-controls": "meetings" %>

data/app/views/decidim/meetings/directory/meetings/_meetings.html.erb

@@ -8,7 +8,12 @@
       <%= render partial: "decidim/shared/results_per_page" %>
     </div>
     <div class="column">
-      <%= render partial: "decidim/meetings/calendar_modal", locals: { path: calendar_url } %>
+      <%= render partial: "decidim/meetings/calendar_modal", locals: {
+        path: short_url(
+          route_name: "calendar",
+          params: { filter: params.fetch(:filter, {}).try(:to_unsafe_hash) }
+        )
+      } %>
     </div>
   </div>
 

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

@@ -6,7 +6,7 @@
       <%= render partial: "decidim/meetings/meetings/count" %>
     </h1>
 
-    <%= cell "decidim/meetings/meetings_map", search.results %>
+    <%= cell "decidim/meetings/meetings_map", search.result %>
 
     <div class="columns mediumlarge-4 large-3">
       <div class="card card--secondary show-for-mediumlarge">