decidim-meetings 0.20.1 → 0.23.1

data/app/helpers/decidim/meetings/application_helper.rb

@@ -10,6 +10,32 @@ module Decidim
       include Decidim::Meetings::MapHelper
       include Decidim::Meetings::MeetingsHelper
       include Decidim::Comments::CommentsHelper
+      include Decidim::SanitizeHelper
+      include Decidim::CheckBoxesTreeHelper
+
+      def filter_origin_values
+        origin_values = []
+        origin_values << TreePoint.new("official", t("decidim.meetings.meetings.filters.origin_values.official"))
+        origin_values << TreePoint.new("citizens", t("decidim.meetings.meetings.filters.origin_values.citizens")) # todo
+        # if component_settings enabled enabled
+        origin_values << TreePoint.new("user_group", t("decidim.meetings.meetings.filters.origin_values.user_groups")) # todo
+        # if current_organization.user_groups_enabled? and component_settings enabled enabled
+
+        TreeNode.new(
+          TreePoint.new("", t("decidim.meetings.meetings.filters.origin_values.all")),
+          origin_values
+        )
+      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"))
+          ]
+        )
+      end
     end
   end
 end

data/app/helpers/decidim/meetings/map_helper.rb

@@ -4,6 +4,7 @@ module Decidim
   module Meetings
     # This helper include some methods for rendering meetings dynamic maps.
     module MapHelper
+      include Decidim::SanitizeHelper
       # Serialize a collection of geocoded meetings to be used by the dynamic map component
       #
       # meetings - A collection of meetings
@@ -18,7 +19,7 @@ module Decidim
                                                                startTime: "#{meeting.start_time.strftime("%H:%M")} - #{meeting.end_time.strftime("%H:%M")}",
                                                                icon: icon("meetings", width: 40, height: 70, remove_icon_class: true),
                                                                location: translated_attribute(meeting.location),
-                                                               locationHints: translated_attribute(meeting.location_hints),
+                                                               locationHints: decidim_html_escape(translated_attribute(meeting.location_hints)),
                                                                link: resource_locator(meeting).path)
         end
       end

data/app/helpers/decidim/meetings/meetings_helper.rb

@@ -16,7 +16,7 @@ module Decidim
       # Returns the meeting's description truncated.
       def meeting_description(meeting, max_length = 120)
         link = resource_locator(meeting).path
-        description = present(meeting).description
+        description = CGI.unescapeHTML present(meeting).description
         tail = "... #{link_to(t("read_more", scope: "decidim.meetings"), link)}".html_safe
         CGI.unescapeHTML html_truncate(description, max_length: max_length, tail: tail)
       end
@@ -107,6 +107,18 @@ module Decidim
           t("validation_pending", scope: "decidim.meetings.meetings.show.registration_state")
         end
       end
+
+      def author_presenter_for(author)
+        if author.is_a?(Decidim::Organization)
+          Decidim::Meetings::OfficialAuthorPresenter.new
+        else
+          present(author)
+        end
+      end
+
+      def current_user_groups?
+        current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any?
+      end
     end
   end
 end

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

@@ -7,6 +7,9 @@ module Decidim
     class Agenda < Meetings::ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::TranslatableResource
+
+      translatable_fields :title
 
       belongs_to :meeting, foreign_key: "decidim_meeting_id", class_name: "Decidim::Meetings::Meeting"
       has_many :agenda_items, foreign_key: "decidim_agenda_id", class_name: "Decidim::Meetings::AgendaItem", dependent: :destroy, inverse_of: :agenda

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

@@ -7,6 +7,9 @@ module Decidim
     class AgendaItem < Meetings::ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::TranslatableResource
+
+      translatable_fields :title, :description
 
       belongs_to :agenda, -> { order(:position) }, foreign_key: "decidim_agenda_id", class_name: "Decidim::Meetings::Agenda"
 

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

@@ -10,30 +10,33 @@ module Decidim
       include Decidim::HasAttachmentCollections
       include Decidim::HasComponent
       include Decidim::HasReference
-      include Decidim::ScopableComponent
+      include Decidim::ScopableResource
       include Decidim::HasCategory
       include Decidim::Followable
       include Decidim::Comments::Commentable
       include Decidim::Searchable
       include Decidim::Traceable
       include Decidim::Loggable
-      include Decidim::Hashtaggable
       include Decidim::Forms::HasQuestionnaire
       include Decidim::Paddable
       include Decidim::ActsAsAuthor
+      include Decidim::Reportable
+      include Decidim::Authorable
+      include Decidim::TranslatableResource
+
+      translatable_fields :title, :description, :location, :location_hints, :closing_report, :registration_terms
 
-      belongs_to :organizer, foreign_key: "organizer_id", class_name: "Decidim::User", optional: true
       has_many :registrations, class_name: "Decidim::Meetings::Registration", foreign_key: "decidim_meeting_id", dependent: :destroy
       has_many :invites, class_name: "Decidim::Meetings::Invite", foreign_key: "decidim_meeting_id", dependent: :destroy
+      has_many :services, class_name: "Decidim::Meetings::Service", foreign_key: "decidim_meeting_id", dependent: :destroy
       has_one :minutes, class_name: "Decidim::Meetings::Minutes", foreign_key: "decidim_meeting_id", dependent: :destroy
       has_one :agenda, class_name: "Decidim::Meetings::Agenda", foreign_key: "decidim_meeting_id", dependent: :destroy
 
       component_manifest_name "meetings"
 
       validates :title, presence: true
-      validate :organizer_belongs_to_organization
 
-      geocoded_by :address, http_headers: ->(proposal) { { "Referer" => proposal.component.organization.host } }
+      geocoded_by :address
 
       scope :past, -> { where(arel_table[:end_time].lteq(Time.current)) }
       scope :upcoming, -> { where(arel_table[:end_time].gteq(Time.current)) }
@@ -76,6 +79,11 @@ module Decidim
         !closed? && registrations_enabled? && can_participate?(user)
       end
 
+      def can_register_invitation?(user)
+        !closed? && registrations_enabled? &&
+          can_participate_in_space?(user) && user_has_invitation_for_meeting?(user)
+      end
+
       def closed?
         closed_at.present?
       end
@@ -133,16 +141,6 @@ module Decidim
         can_participate_in_space?(user) && can_participate_in_meeting?(user)
       end
 
-      def organizer_belongs_to_organization
-        return if !organizer || !organization
-
-        errors.add(:organizer, :invalid) unless organizer.organization == organization
-      end
-
-      def official?
-        organizer.nil?
-      end
-
       def current_user_can_visit_meeting?(current_user)
         (private_meeting? && registrations.exists?(decidim_user_id: current_user.try(:id))) ||
           !private_meeting? || (private_meeting? && transparent?)
@@ -173,6 +171,22 @@ module Decidim
         (Time.current - end_time) < 72.hours
       end
 
+      def authored_proposals
+        Decidim::Proposals::Proposal
+          .joins(:coauthorships)
+          .where(
+            decidim_coauthorships: {
+              decidim_author_type: "Decidim::Meetings::Meeting",
+              decidim_author_id: id
+            }
+          )
+      end
+
+      # Public: Overrides the `reported_content_url` Reportable concern method.
+      def reported_content_url
+        ResourceLocatorPresenter.new(self).url
+      end
+
       private
 
       def can_participate_in_meeting?(user)
@@ -181,6 +195,13 @@ module Decidim
 
         registrations.exists?(decidim_user_id: user.id)
       end
+
+      def user_has_invitation_for_meeting?(user)
+        return true unless private_meeting?
+        return false unless user
+
+        invites.exists?(decidim_user_id: user.id)
+      end
     end
   end
 end

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

@@ -6,6 +6,9 @@ module Decidim
     class Minutes < Meetings::ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::TranslatableResource
+
+      translatable_fields :description
 
       belongs_to :meeting, foreign_key: "decidim_meeting_id", class_name: "Decidim::Meetings::Meeting"
 

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class Service < Meetings::ApplicationRecord
+      include Decidim::Traceable
+      include Decidim::TranslatableResource
+
+      translatable_fields :title, :description
+      belongs_to :meeting, foreign_key: "decidim_meeting_id", class_name: "Decidim::Meetings::Meeting"
+    end
+  end
+end

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

@@ -37,6 +37,8 @@ module Decidim
         def allowed_meeting_action?
           return unless permission_action.subject == :meeting
 
+          return disallow! if meeting && !meeting.official?
+
           case permission_action.action
           when :close, :copy, :destroy, :export_registrations, :update, :read_invites
             toggle_allow(meeting.present?)

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

@@ -19,6 +19,12 @@ module Decidim
           toggle_allow(can_leave_meeting?)
         when :decline_invitation
           toggle_allow(can_decline_invitation?)
+        when :create
+          toggle_allow(can_create_meetings?)
+        when :update
+          toggle_allow(can_update_meeting?)
+        when :register
+          toggle_allow(can_register_invitation_meeting?)
         end
 
         permission_action
@@ -43,6 +49,20 @@ module Decidim
         meeting.registrations_enabled? &&
           meeting.invites.where(user: user).exists?
       end
+
+      def can_create_meetings?
+        component_settings&.creation_enabled_for_participants?
+      end
+
+      def can_update_meeting?
+        component_settings&.creation_enabled_for_participants? &&
+          meeting.authored_by?(user)
+      end
+
+      def can_register_invitation_meeting?
+        meeting.can_register_invitation?(user) &&
+          authorized?(:register, resource: meeting)
+      end
     end
   end
 end

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

@@ -24,9 +24,13 @@ module Decidim
           end
         end
 
+        # Tries to use the attendee name from the invitation (resource).
+        # If invitation does not exist anymore use the one in extras.
         def i18n_params
+          attendee_name = action_log.resource ? action_log.resource.user.name : action_log.extra["attendee_name"]
           super.merge(
-            attendee_name: action_log.resource.user.name
+            # before Decidim v0.23.0 attendee_name was not being copied into the extras so it may be nil
+            attendee_name: attendee_name || "????"
           )
         end
       end

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

@@ -33,8 +33,7 @@ module Decidim
             start_date: :date,
             title: "Decidim::Meetings::AdminLog::ValueTypes::MeetingTitleDescriptionPresenter",
             private_meeting: :boolean,
-            transparent: :boolean,
-            organizer_id: "Decidim::Meetings::AdminLog::ValueTypes::OrganizerPresenter"
+            transparent: :boolean
           }
         end
 

data/app/presenters/decidim/meetings/meeting_presenter.rb

@@ -18,8 +18,7 @@ module Decidim
         return unless meeting
 
         handle_locales(meeting.title, all_locales) do |content|
-          content = decidim_html_escape(content)
-          renderer = Decidim::ContentRenderers::HashtagRenderer.new(content)
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(decidim_html_escape(content))
           renderer.render(links: links).html_safe
         end
       end
@@ -28,7 +27,7 @@ module Decidim
         return unless meeting
 
         handle_locales(meeting.description, all_locales) do |content|
-          renderer = Decidim::ContentRenderers::HashtagRenderer.new(content)
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(decidim_sanitize(content))
           renderer.render(links: links).html_safe
         end
       end
@@ -66,12 +65,28 @@ module Decidim
         false
       end
 
+      def proposals
+        return unless meeting
+
+        @proposals ||= meeting.authored_proposals.load
+      end
+
+      def formatted_proposals_titles
+        return unless meeting
+
+        proposals.map.with_index { |proposal, index| "#{index + 1}) #{proposal.title}\n" }
+      end
+
       private
 
-      def handle_locales(content, all_locales)
+      def handle_locales(content, all_locales, &block)
         if all_locales
-          content.each_with_object({}) do |(locale, string), parsed_content|
-            parsed_content[locale] = yield(string)
+          content.each_with_object({}) do |(key, value), parsed_content|
+            parsed_content[key] = if key == "machine_translations"
+                                    handle_locales(value, all_locales, &block)
+                                  else
+                                    block.call(value)
+                                  end
           end
         else
           yield(translated_attribute(content))

data/app/presenters/decidim/meetings/official_author_presenter.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    #
+    # A dummy presenter to abstract out the author of an official meeting.
+    #
+    class OfficialAuthorPresenter < Decidim::OfficialAuthorPresenter
+      def name
+        I18n.t("decidim.meetings.models.meeting.fields.official_meeting")
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # A class used to find meetings filtered by components and a date range
+    class FilteredMeetings < Rectify::Query
+      # Syntactic sugar to initialize the class and return the queried objects.
+      #
+      # components - An array of Decidim::Component
+      # start_at - A date to filter resources created after it
+      # end_at - A date to filter resources created before it.
+      def self.for(components, start_at = nil, end_at = nil)
+        new(components, start_at, end_at).query
+      end
+
+      # Initializes the class.
+      #
+      # components - An array of Decidim::Component
+      # start_at - A date to filter resources created after it
+      # end_at - A date to filter resources created before it.
+      def initialize(components, start_at = nil, end_at = nil)
+        @components = components
+        @start_at = start_at
+        @end_at = end_at
+      end
+
+      # Finds the Projects scoped to an array of components and filtered
+      # by a range of dates.
+      def query
+        meetings = Decidim::Meetings::Meeting.not_hidden.where(component: @components)
+        meetings = meetings.where("created_at >= ?", @start_at) if @start_at.present?
+        meetings = meetings.where("created_at <= ?", @end_at) if @end_at.present?
+        meetings
+      end
+    end
+  end
+end

data/app/queries/decidim/meetings/metrics/meetings_metric_manage.rb

@@ -9,9 +9,6 @@ module Decidim
         end
 
         def save
-          return @registry if @registry
-
-          @registry = []
           cumulative.each do |key, cumulative_value|
             next if cumulative_value.zero?
 
@@ -21,10 +18,8 @@ module Decidim
                                                            organization: @organization, decidim_category_id: category_id,
                                                            participatory_space_type: space_type, participatory_space_id: space_id)
             record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
-            @registry << record
+            record.save!
           end
-          @registry.each(&:save!)
-          @registry
         end
 
         private
@@ -35,8 +30,7 @@ module Decidim
           spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
             manifest.participatory_spaces.call(@organization).public_spaces
           end
-          components = Decidim::Component.where(participatory_space: spaces).published
-          @query = Decidim::Meetings::Meeting.where(component: components).joins(:component)
+          @query = Decidim::Meetings::Meeting.where(component: visible_component_ids_from_spaces(spaces)).joins(:component)
                                              .left_outer_joins(:category).visible
           @query = @query.where("decidim_meetings_meetings.created_at <= ?", end_time)
           @query = @query.group("decidim_categorizations.decidim_category_id",

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

@@ -36,10 +36,10 @@ module Decidim
           return @event if @event
 
           @event = Icalendar::Event.new
-          @event.dtstart = Icalendar::Values::DateTime.new(meeting.start_time)
-          @event.dtend = Icalendar::Values::DateTime.new(meeting.end_time)
+          @event.dtstart = Icalendar::Values::DateTime.new(meeting.start_time.utc, "tzid" => "UTC")
+          @event.dtend = Icalendar::Values::DateTime.new(meeting.end_time.utc, "tzid" => "UTC")
           @event.summary = present(meeting).title
-          @event.description = strip_tags(present(meeting).description)
+          @event.description = strip_tags(CGI.unescapeHTML(present(meeting).description))
           @event.location = meeting.address
           @event.geo = [meeting.latitude, meeting.longitude]
           @event.url = url_for(meeting)