decidim-meetings 0.22.0 → 0.23.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cf71231fe2e852a9101945044108cb1b3ae06a9ae7b952db3b0e895fed6e96e
-  data.tar.gz: b191dbff11d2168da9e8535992f2005a3fbb55021a4e36df40948adca6c9b946
+  metadata.gz: 22df53220678ed19fc0fcdaace75d4eeeb176359964ee0e33a05272bac17d585
+  data.tar.gz: e8632ee7f75734cdae00df1f082e6ac2ac3f851213ca86f70fb08c638e21a2a3
 SHA512:
-  metadata.gz: dfa66b38d9f02d3f9e71be17d6920deee816100e572a73e80f2c42a722f1de28cf8041cacc434c533b0bde954eebc4da9594f979d220e0801d3d7ccccb06eb52
-  data.tar.gz: 6907691fd0d7f9c626acbbcb81bcb561967d82ba23967d50b6589950acaf4a749a8ba658fd432b9a25c6b928aab01615baa1471b80565fce8a8c1ffe554a528c
+  metadata.gz: be2f3d7da0855204ea210b3bf3c22a3b9b350b0ad3bb43a16d334d114c0cd226bdffa26f61797a26c89644caed05b8b006c4bb0ed2809ce68ad89b3ca44a1924
+  data.tar.gz: bebecedc4b34d8730f2c2963e3dc697e4ddb78d8c93207c04fd82833c1f1fe780207ede45a0d36a2cf6e31338b02e42d6d1d696c2c6cff512b3be8b8bb00f55f

data/app/assets/config/decidim_meetings_manifest.js

@@ -1,3 +1,4 @@
+//= link decidim/meetings/meetings_form.js
 //= link decidim/meetings/admin/meetings_form.js
 //= link decidim/meetings/admin/registrations_form.js
 //= link decidim/meetings/admin/registrations_invite_form.js

data/app/assets/javascripts/decidim/meetings/admin/meetings_form.js.es6

@@ -1,5 +1,6 @@
 ((exports) => {
   const { AutoLabelByPositionComponent, AutoButtonsByPositionComponent, createDynamicFields, createSortList } = exports.DecidimAdmin;
+  const { attachGeocoding } = window.Decidim;
 
   const wrapperSelector = ".meeting-services";
   const fieldSelector = ".meeting-service";
@@ -93,5 +94,7 @@
 
     $privateMeeting.on("change", toggleDisabledHiddenFields);
     toggleDisabledHiddenFields();
+
+    attachGeocoding($form.find("#meeting_address"));
   }
 })(window);

data/app/assets/javascripts/decidim/meetings/meetings_form.js.es6

@@ -0,0 +1,9 @@
+((exports) => {
+  const $ = exports.$; // eslint-disable-line
+  const { attachGeocoding } = exports.Decidim;
+
+  $(() => {
+    // Adds the latitude/longitude inputs after the geocoding is done
+    attachGeocoding($("#meeting_address"));
+  });
+})(window);

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

@@ -16,13 +16,14 @@ module Decidim
           @upcoming_events ||= Decidim::Meetings::Meeting
                                .includes(component: :participatory_space)
                                .where(component: meeting_components)
+                               .visible_meeting_for(current_user)
                                .where("end_time >= ?", Time.current)
                                .order(start_time: :asc)
                                .limit(limit)
         end
 
         def geolocation_enabled?
-          Decidim.geocoder.present?
+          Decidim::Map.available?(:geocoding)
         end
 
         def meetings_directory_path

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

@@ -18,7 +18,7 @@ module Decidim
       private
 
       def meetings
-        @meetings ||= Decidim::Meetings::Meeting.where(component: model)
+        @meetings ||= Decidim::Meetings::Meeting.where(component: model).visible_meeting_for(current_user)
       end
 
       def past_meetings

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

@@ -28,7 +28,7 @@ module Decidim
       end
 
       def title
-        decidim_html_escape(present(model).title)
+        present(model).title
       end
 
       def resource_icon

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

@@ -14,11 +14,11 @@ module Decidim
       private
 
       def resource_path
-        resource_locator(model).path
+        resource_locator(model).path(filter_link_params)
       end
 
       def title
-        decidim_html_escape(present(model).title)
+        present(model).title
       end
 
       def resource_date_time

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

@@ -7,6 +7,14 @@ module Decidim
     class MeetingMCell < Decidim::CardMCell
       include MeetingCellsHelper
 
+      def has_authors?
+        true
+      end
+
+      def render_authorship
+        cell "decidim/author", author_presenter_for(model.normalized_author)
+      end
+
       def date
         render
       end
@@ -16,7 +24,7 @@ module Decidim
       end
 
       def title
-        decidim_html_escape(present(model).title)
+        present(model).title
       end
 
       private

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

@@ -28,6 +28,4 @@
       </div>
     </div>
   </template>
-  <%= stylesheet_link_tag "decidim/map" %>
-  <%= javascript_include_tag "decidim/map" %>
 <% end.html_safe %>

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

@@ -6,8 +6,10 @@ module Decidim
       include Decidim::MapHelper
       include Decidim::Meetings::MapHelper
 
+      delegate :snippets, to: :controller
+
       def show
-        return if Decidim.geocoder.blank?
+        return unless Decidim::Map.available?(:geocoding, :dynamic)
 
         render
       end

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

@@ -52,8 +52,7 @@ module Decidim
             event: "decidim.events.meetings.meeting_closed",
             event_class: Decidim::Meetings::CloseMeetingEvent,
             resource: meeting,
-            affected_users: [meeting.organizer],
-            followers: meeting.followers - [meeting.organizer]
+            followers: meeting.followers
           )
         end
 

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

@@ -26,61 +26,71 @@ module Decidim
 
           transaction do
             copy_meeting!
+            copy_services!
             schedule_upcoming_meeting_notification
             send_notification
           end
 
-          broadcast(:ok, @copied_meeting)
+          broadcast(:ok, copied_meeting)
         end
 
         private
 
-        attr_reader :form, :meeting
+        attr_reader :form, :meeting, :copied_meeting
 
         def copy_meeting!
-          parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, @form.title, current_organization: @meeting.organization).rewrite
-          parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, @form.description, current_organization: @meeting.organization).rewrite
+          parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: meeting.organization).rewrite
+          parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: meeting.organization).rewrite
 
           @copied_meeting = Decidim.traceability.create!(
             Meeting,
-            @form.current_user,
-            scope: @meeting.scope,
-            category: @meeting.category,
+            form.current_user,
+            scope: meeting.scope,
+            category: meeting.category,
             title: parsed_title,
             description: parsed_description,
-            end_time: @form.end_time,
-            start_time: @form.start_time,
-            address: @form.address,
-            latitude: @form.latitude,
-            longitude: @form.longitude,
-            location: @form.location,
-            location_hints: @form.location_hints,
-            services: @form.services_to_persist.map { |service| { "title" => service.title, "description" => service.description } },
-            component: @meeting.component,
-            private_meeting: @form.private_meeting,
-            transparent: @form.transparent,
-            organizer: @form.organizer,
-            questionnaire: @form.questionnaire,
-            registrations_enabled: @meeting.registrations_enabled,
-            available_slots: @meeting.available_slots,
-            registration_terms: @meeting.registration_terms
+            end_time: form.end_time,
+            start_time: form.start_time,
+            address: form.address,
+            latitude: form.latitude,
+            longitude: form.longitude,
+            location: form.location,
+            location_hints: form.location_hints,
+            component: meeting.component,
+            private_meeting: form.private_meeting,
+            transparent: form.transparent,
+            author: form.current_organization,
+            questionnaire: form.questionnaire,
+            registrations_enabled: meeting.registrations_enabled,
+            available_slots: meeting.available_slots,
+            registration_terms: meeting.registration_terms
           )
         end
 
+        def copy_services!
+          form.services_to_persist.map do |service|
+            Decidim::Meetings::Service.create!(
+              meeting: copied_meeting,
+              "title" => service.title,
+              "description" => service.description
+            )
+          end
+        end
+
         def schedule_upcoming_meeting_notification
-          checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(@copied_meeting)
+          checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(copied_meeting)
 
           Decidim::Meetings::UpcomingMeetingNotificationJob
-            .set(wait_until: @copied_meeting.start_time - 2.days)
-            .perform_later(@copied_meeting.id, checksum)
+            .set(wait_until: copied_meeting.start_time - 2.days)
+            .perform_later(copied_meeting.id, checksum)
         end
 
         def send_notification
           Decidim::EventsManager.publish(
             event: "decidim.events.meetings.meeting_created",
             event_class: Decidim::Meetings::CreateMeetingEvent,
-            resource: @copied_meeting,
-            followers: @copied_meeting.participatory_space.followers
+            resource: copied_meeting,
+            followers: copied_meeting.participatory_space.followers
           )
         end
       end

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

@@ -18,61 +18,73 @@ module Decidim
 
           transaction do
             create_meeting!
+            create_services!
             schedule_upcoming_meeting_notification
             send_notification
           end
 
-          broadcast(:ok, @meeting)
+          broadcast(:ok, meeting)
         end
 
         private
 
+        attr_reader :form, :meeting
+
         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_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
           params = {
-            scope: @form.scope,
-            category: @form.category,
+            scope: form.scope,
+            category: form.category,
             title: parsed_title,
             description: parsed_description,
-            services: @form.services_to_persist.map { |service| { "title" => service.title, "description" => service.description } },
-            end_time: @form.end_time,
-            start_time: @form.start_time,
-            address: @form.address,
-            latitude: @form.latitude,
-            longitude: @form.longitude,
-            location: @form.location,
-            location_hints: @form.location_hints,
-            private_meeting: @form.private_meeting,
-            transparent: @form.transparent,
-            organizer: @form.organizer,
-            registration_terms: @form.current_component.settings.default_registration_terms,
-            component: @form.current_component,
+            end_time: form.end_time,
+            start_time: form.start_time,
+            address: form.address,
+            latitude: form.latitude,
+            longitude: form.longitude,
+            location: form.location,
+            location_hints: form.location_hints,
+            private_meeting: form.private_meeting,
+            transparent: form.transparent,
+            author: form.current_organization,
+            registration_terms: form.current_component.settings.default_registration_terms,
+            component: form.current_component,
             questionnaire: Decidim::Forms::Questionnaire.new
           }
 
           @meeting = Decidim.traceability.create!(
             Meeting,
-            @form.current_user,
+            form.current_user,
             params,
             visibility: "all"
           )
         end
 
+        def create_services!
+          form.services_to_persist.each do |service|
+            Decidim::Meetings::Service.create!(
+              meeting: meeting,
+              "title" => service.title,
+              "description" => service.description
+            )
+          end
+        end
+
         def schedule_upcoming_meeting_notification
-          checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(@meeting)
+          checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(meeting)
 
           Decidim::Meetings::UpcomingMeetingNotificationJob
-            .set(wait_until: @meeting.start_time - 2.days)
-            .perform_later(@meeting.id, checksum)
+            .set(wait_until: meeting.start_time - 2.days)
+            .perform_later(meeting.id, checksum)
         end
 
         def send_notification
           Decidim::EventsManager.publish(
             event: "decidim.events.meetings.meeting_created",
             event_class: Decidim::Meetings::CreateMeetingEvent,
-            resource: @meeting,
-            followers: @meeting.participatory_space.followers
+            resource: meeting,
+            followers: meeting.participatory_space.followers
           )
         end
       end

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

@@ -50,7 +50,8 @@ module Decidim
             },
             participatory_space: {
               title: meeting.participatory_space.title
-            }
+            },
+            attendee_name: user.name
           }
 
           @invite = Decidim.traceability.create!(

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

@@ -25,6 +25,7 @@ module Decidim
             update_meeting!
             send_notification if should_notify_followers?
             schedule_upcoming_meeting_notification if start_time_changed?
+            update_services!
           end
 
           broadcast(:ok, meeting)
@@ -45,7 +46,6 @@ module Decidim
             category: form.category,
             title: parsed_title,
             description: parsed_description,
-            services: form.services_to_persist.map { |service| { "title" => service.title, "description" => service.description } },
             end_time: form.end_time,
             start_time: form.start_time,
             address: form.address,
@@ -54,11 +54,17 @@ module Decidim
             location: form.location,
             location_hints: form.location_hints,
             private_meeting: form.private_meeting,
-            transparent: form.transparent,
-            organizer: form.organizer
+            transparent: form.transparent
           )
         end
 
+        def update_services!
+          meeting.services = form.services_to_persist.map do |service|
+            Decidim::Meetings::Service.new("title" => service.title, "description" => service.description)
+          end
+          meeting.save!
+        end
+
         def send_notification
           Decidim::EventsManager.publish(
             event: "decidim.events.meetings.meeting_updated",

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

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This command is executed when a participant or user group creates a Meeting from the public
+    # views.
+    class CreateMeeting < Rectify::Command
+      def initialize(form)
+        @form = form
+      end
+
+      # Creates the meeting if valid.
+      #
+      # Broadcasts :ok if successful, :invalid otherwise.
+      def call
+        return broadcast(:invalid) if form.invalid?
+
+        transaction do
+          create_meeting!
+          schedule_upcoming_meeting_notification
+          send_notification
+        end
+
+        broadcast(:ok, meeting)
+      end
+
+      private
+
+      attr_reader :meeting, :form
+
+      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
+        params = {
+          scope: form.scope,
+          category: form.category,
+          title: { I18n.locale => parsed_title },
+          description: { I18n.locale => parsed_description },
+          end_time: form.end_time,
+          start_time: form.start_time,
+          address: form.address,
+          latitude: form.latitude,
+          longitude: form.longitude,
+          location: { I18n.locale => form.location },
+          location_hints: { I18n.locale => form.location_hints },
+          author: form.current_user,
+          decidim_user_group_id: form.user_group_id,
+          registration_terms: form.current_component.settings.default_registration_terms,
+          component: form.current_component
+        }
+
+        @meeting = Decidim.traceability.create!(
+          Meeting,
+          form.current_user,
+          params,
+          visibility: "public-only"
+        )
+      end
+
+      def schedule_upcoming_meeting_notification
+        checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(meeting)
+
+        Decidim::Meetings::UpcomingMeetingNotificationJob
+          .set(wait_until: meeting.start_time - 2.days)
+          .perform_later(meeting.id, checksum)
+      end
+
+      def send_notification
+        Decidim::EventsManager.publish(
+          event: "decidim.events.meetings.meeting_created",
+          event_class: Decidim::Meetings::CreateMeetingEvent,
+          resource: meeting,
+          followers: meeting.participatory_space.followers
+        )
+      end
+    end
+  end
+end