decidim-meetings 0.21.0 → 0.23.2

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
 
@@ -51,8 +50,8 @@ module Decidim
           "activemodel.attributes.meeting"
         end
 
-        def has_diff?
-          action == "close" || super
+        def diff_actions
+          super + %w(close)
         end
       end
     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

@@ -27,7 +27,7 @@ module Decidim
       # Finds the Projects scoped to an array of components and filtered
       # by a range of dates.
       def query
-        meetings = Decidim::Meetings::Meeting.where(component: @components)
+        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

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

@@ -39,7 +39,7 @@ module Decidim
           @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)

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class DiffRenderer < BaseDiffRenderer
+      def attribute_types
+        {
+          title: :string,
+          description: :html,
+          address: :string,
+          location: :string,
+          location_hints: :string,
+          start_time: :date,
+          end_time: :date,
+          decidim_user_group_id: :user_group,
+          decidim_scope_id: :scope
+        }
+      end
+    end
+  end
+end

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

@@ -6,6 +6,8 @@ module Decidim
     # `current_component` param with a `Decidim::Component` in order to
     # find the meetings.
     class MeetingSearch < ResourceSearch
+      text_search_fields :title, :description
+
       # Public: Initializes the service.
       # component     - A Decidim::Component to get the meetings from.
       # page        - The page number to paginate the results.
@@ -15,20 +17,9 @@ module Decidim
         super(scope, options)
       end
 
-      # Handle the search_text filter
-      def search_search_text
-        query
-          .where(localized_search_text_in(:title), text: "%#{search_text}%")
-          .or(query.where(localized_search_text_in(:description), text: "%#{search_text}%"))
-      end
-
       # Handle the date filter
       def search_date
-        if options[:date] == "upcoming"
-          query.where("end_time >= ? ", Time.current).order(start_time: :asc)
-        elsif options[:date] == "past"
-          query.where("end_time <= ? ", Time.current).order(start_time: :desc)
-        end
+        apply_scopes(%w(upcoming past), date)
       end
 
       def search_space
@@ -36,19 +27,6 @@ module Decidim
 
         query.joins(:component).where(decidim_components: { participatory_space_type: options[:space].classify })
       end
-
-      private
-
-      # Internal: builds the needed query to search for a text in the organization's
-      # available locales. Note that it is intended to be used as follows:
-      #
-      # Example:
-      #   Resource.where(localized_search_text_for(:title, text: "my_query"))
-      #
-      # The Hash with the `:text` key is required or it won't work.
-      def localized_search_text_in(field)
-        options[:organization].available_locales.map { |l| "#{field} ->> '#{l}' ILIKE :text" }.join(" OR ")
-      end
     end
   end
 end

data/app/types/decidim/meetings/meeting_type.rb

@@ -23,7 +23,7 @@ module Decidim
       field :description, Decidim::Core::TranslatedFieldType, "The description of this meeting."
       field :startTime, !Decidim::Core::DateTimeType, "The time this meeting starts", property: :start_time
       field :endTime, !Decidim::Core::DateTimeType, "The time this meeting ends", property: :end_time
-      field :organizer, Decidim::Core::AuthorInterface, "If specified, the organizer of this meeting"
+      field :author, Decidim::Core::AuthorInterface, "If specified, the author of this meeting"
       field :agenda, AgendaType, "Agenda for this meeting, if available" do
         resolve ->(meeting, _args, _ctx) {
           meeting.agenda if meeting.agenda&.visible?

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

@@ -1,13 +1,13 @@
-<button class="button button--title secondary light share-link text-center calendar" data-open="calendarShare">
+<button class="button button--title share-link text-center calendar" data-open="calendarShare">
   <%= t(".export_calendar") %>
-  <%= icon "share", class: "icon--after" %>
+  <%= icon "share", class: "icon--after", role: "img", "aria-hidden": true %>
 </button>
 <div class="reveal" id="calendarShare" data-reveal>
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t(".calendar_url") %>:</h3>
+    <h2 class="reveal__title"><%= t(".calendar_url") %>:</h2>
     <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>
+  <input type="text" value="<%= "#{path}" %>" readonly title="<%= t(".calendar_url") %>">
 </div>

data/app/views/decidim/meetings/admin/invites/index.html.erb

@@ -45,8 +45,8 @@
           <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
           <%= hidden_field_tag :state, @state %>
           <div class="input-group-button">
-            <button type="submit" class="button button--muted">
-              <%= icon "magnifying-glass", aria_label: t(".search") %>
+            <button type="submit" class="button">
+              <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
             </button>
           </div>
         </div>

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

@@ -22,12 +22,7 @@
       </div>
     </div>
     <div class="row column">
-      <% if @form.proposals %>
-        <%= form.select :proposal_ids,
-                      @form.proposals.order(title: :asc).map{|proposal| [decidim_html_escape(present(proposal).title), proposal.id]},
-                      { include_blank: true },
-                      { multiple: true, class: "chosen-select" } %>
-      <% end %>
+      <%= proposals_picker(form, :proposals, proposals_picker_meeting_meeting_closes_path(meeting)) %>
     </div>
   </div>
 </div>

data/app/views/decidim/meetings/admin/meeting_closes/proposals_picker.html.erb

@@ -0,0 +1 @@
+<%= cell "decidim/proposals/proposals_picker", current_component %>

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

@@ -4,7 +4,7 @@
   </div>
 
   <div class="card-section">
-    <div class="row column  hashtags__container">
+    <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>
 
@@ -13,7 +13,7 @@
     </div>
 
     <div class="row column">
-      <%= form.text_field :address %>
+      <%= form.geocoding_field :address %>
     </div>
 
     <div class="row column">
@@ -34,13 +34,6 @@
       </div>
     </div>
 
-    <div class="row column">
-      <% prompt_options = { url: decidim_admin.users_organization_url, text: t(".select_organizer") } %>
-      <%= form.autocomplete_select(:organizer_id, form.object.organizer.presence, { multiple: false }, prompt_options) do |user|
-        { value: user.id, label: "#{user.name} (@#{user.nickname})" }
-      end %>
-    </div>
-
     <div class="row column" id="private_meeting">
       <%= form.check_box :private_meeting %>
     </div>

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

@@ -3,7 +3,7 @@
     <h2 class="card-title"><%= title %></h2>
   </div>
   <div class="card-section">
-    <div class="row column  hashtags__container">
+    <div class="row column hashtags__container">
       <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true %>
     </div>
 
@@ -12,7 +12,7 @@
     </div>
 
     <div class="row column">
-      <%= form.text_field :address %>
+      <%= form.geocoding_field :address %>
       <p class="help-text"><%= t(".address_help") %></p>
     </div>
 
@@ -36,24 +36,17 @@
       </div>
     </div>
     <div class="row">
-      <% if current_participatory_space.has_subscopes? %>
+      <% if current_component.has_subscopes? %>
         <div class="columns xlarge-6">
-          <%= scopes_picker_field form, :decidim_scope_id %>
+          <%= scopes_picker_field form, :decidim_scope_id, root: current_component.scope %>
         </div>
       <% end %>
 
       <div class="columns xlarge-6">
-        <%= form.categories_select :decidim_category_id, current_participatory_space.categories, prompt: "", disable_parents: false %>
+        <%= form.categories_select :decidim_category_id, current_participatory_space.categories, include_blank: "", disable_parents: false %>
       </div>
     </div>
 
-    <div class="row column">
-      <% prompt_options = { url: decidim_admin.users_organization_url, text: t(".select_organizer") } %>
-      <%= form.autocomplete_select(:organizer_id, form.object.organizer.presence, { multiple: false }, prompt_options) do |user|
-        { value: user.id, label: "#{user.name} (@#{user.nickname})" }
-      end %>
-    </div>
-
     <div class="row column" id="private_meeting">
       <%= form.check_box :private_meeting %>
     </div>

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

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, html: { class: "form edit_meeting" })  do |f| %>
+<%= decidim_form_for(@form, url: { action: "update" }, html: { class: "form edit_meeting" })  do |f| %>
   <%= render partial: "form", object: f %>
 
     <div class="button--double form-general-submit">