decidim-meetings 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80d31c76a8db7adbdcb2734ed6bf5a1481f118b333b1d4deb3480bbc0aa5706d
-  data.tar.gz: 1461a87bbe59cfa991b2f63aa41b6167c18ac905465eda4b7eaa22a55dad0c83
+  metadata.gz: d0207852bd8f1cbfc88f230a458885bd8f0ee18b8eae8b05cf00c8d443e3dd89
+  data.tar.gz: b7c0a7214101781fda90accbee4daeae9b101c1335135e1bd8556d93f239ef0f
 SHA512:
-  metadata.gz: 3c9862bada8286e83962a911692c905f7b41a366455519ee02f5fc3dd712e0dab9f3d31e7d7526c31ca26d84655f2bb67ff1a861678bd3d2ac03079ce298573f
-  data.tar.gz: '099d063699b7e499cf3c7c9e2b8187e529209d2e92356863c3f7eb246a42bc9abc9f5f82ec2a230dcdbf33357bce0e33ef7308d63060af09117b49cd145ddb68'
+  metadata.gz: d529759af2ec9b392c4f794110d2826a46cda8de3a6433810b8cdb73699fa08b13b2517fa9c44639490e257f3a7fc964d6c1fc583d1defcc4dfbee9297740a5f
+  data.tar.gz: 901ceb505e213473256ac444dce2b75d81a27f8e84867b3b3d806ba394963aa2c22496ed882d69da4802a0824590ee1ccd86f6a4f3c90c575e8b7bc5e3af0686

data/app/cells/decidim/meetings/content_blocks/upcoming_events/show.erb

@@ -11,7 +11,7 @@
         <% if geolocation_enabled? %>
           <%= cell "decidim/meetings/meetings_map", upcoming_events %>
         <% else %>
-          <% upcoming_events.last(4).each do |event| %>
+          <% (upcoming_events - upcoming_events.first(4)).each do |event| %>
             <%= card_for event, size: :s %>
           <% end %>
         <% end %>

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

@@ -8,6 +8,7 @@ module Decidim
 
         def show
           return if upcoming_events.blank?
+
           render
         end
 

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

@@ -23,6 +23,7 @@ module Decidim
 
       def button_classes
         return "button expanded button--sc" if big_button?
+
         "button card__button button--sc small"
       end
 
@@ -36,6 +37,7 @@ module Decidim
 
       def i18n_join_text
         return I18n.t("join", scope: "decidim.meetings.meetings.show") if model.has_available_slots?
+
         I18n.t("no_slots_available", scope: "decidim.meetings.meetings.show")
       end
 

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

@@ -27,6 +27,7 @@ module Decidim
 
       def meeting_date
         return render(:multiple_dates) if spans_multiple_dates?
+
         render(:single_date)
       end
 

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

@@ -14,8 +14,8 @@
           <div class="address card__extra">
             <div class="address__icon">{{html icon}}</div>
             <div class="address__details">
-              <strong>{{html location}}</strong><br />
-              <span>${address}</span><br />
+              <strong>{{html location}}</strong><br>
+              <span>${address}</span><br>
               <span>{{html locationHints}}</span>
             </div>
           </div>

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

@@ -8,6 +8,7 @@ module Decidim
 
       def show
         return if Decidim.geocoder.blank?
+
         render
       end
 

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

@@ -22,6 +22,7 @@ module Decidim
         # Broadcasts :ok if successful, :invalid otherwise.
         def call
           return broadcast(:invalid) if form.invalid?
+
           transaction do
             update_minutes!
           end

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

@@ -20,6 +20,7 @@ module Decidim
         def call
           meeting.with_lock do
             return broadcast(:invalid) if form.invalid?
+
             update_meeting_registrations
             send_notification if should_notify_followers?
           end

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

@@ -86,6 +86,7 @@ module Decidim
       def notify_admin_over_percentage
         return send_notification_over(0.5) if occupied_slots_over?(0.5)
         return send_notification_over(0.8) if occupied_slots_over?(0.8)
+
         send_notification_over(1.0) if occupied_slots_over?(1.0)
       end
 

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

@@ -20,6 +20,7 @@ module Decidim
       def call
         @meeting.with_lock do
           return broadcast(:invalid) unless registration
+
           destroy_registration
           destroy_questionnaire_answers
           decrement_score

data/app/controllers/decidim/meetings/meetings_controller.rb

@@ -11,10 +11,11 @@ module Decidim
       helper_method :meetings, :meeting, :registration, :search
 
       def index
-        return unless search.results.empty? && params.dig("filter", "date") != "past"
+        return unless search.results.blank? && params.dig("filter", "date") != "past"
 
         @past_meetings = search_klass.new(search_params.merge(date: "past"))
-        unless @past_meetings.results.empty?
+
+        if @past_meetings.results.present?
           params[:filter] ||= {}
           params[:filter][:date] = "past"
           @forced_past_meetings = true
@@ -24,6 +25,7 @@ module Decidim
 
       def show
         return if meeting.current_user_can_visit_meeting?(current_user)
+
         flash[:alert] = I18n.t("meeting.not_allowed", scope: "decidim.meetings")
         redirect_to action: "index"
       end

data/app/forms/decidim/meetings/admin/meeting_form.rb

@@ -47,6 +47,9 @@ module Decidim
           end
 
           self.decidim_category_id = model.categorization.decidim_category_id if model.categorization
+          presenter = MeetingPresenter.new(model)
+          self.title = presenter.title(all_locales: true)
+          self.description = presenter.description(all_locales: true)
         end
 
         def services_to_persist
@@ -79,6 +82,7 @@ module Decidim
 
         def category
           return unless current_component
+
           @category ||= categories.find_by(id: decidim_category_id)
         end
 

data/app/forms/decidim/meetings/admin/meeting_registrations_form.rb

@@ -33,6 +33,7 @@ module Decidim
         # TL;DR: if you remove this method, we'll get errors, so don't.
         def id
           return super if super.present?
+
           meeting.id
         end
 

data/app/forms/decidim/meetings/admin/validate_registration_code_form.rb

@@ -22,6 +22,7 @@ module Decidim
 
         def registration_exists
           return unless registration.nil?
+
           errors.add(
             :code,
             I18n.t("registrations.validate_registration_code.invalid", scope: "decidim.meetings.admin")

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

@@ -10,6 +10,7 @@ module Decidim
 
         def meeting_organizer_picker_text(form)
           return "" if form.object.organizer.blank?
+
           "#{form.object.organizer.name} (@#{form.object.organizer.nickname})"
         end
 

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

@@ -75,6 +75,7 @@ module Decidim
 
       def has_available_slots?
         return true if available_slots.zero?
+
         (available_slots - reserved_slots) > registrations.count
       end
 
@@ -127,6 +128,7 @@ module Decidim
 
       def organizer_belongs_to_organization
         return if !organizer || !organization
+
         errors.add(:organizer, :invalid) unless organizer.organization == organization
       end
 

data/app/presenters/decidim/meetings/admin_log/value_types/organizer_presenter.rb

@@ -16,6 +16,7 @@ module Decidim
           def present
             return unless value
             return present_organizer if organizer
+
             I18n.t("not_found", id: value, scope: "decidim.meetings.admin_log.meeting.value_types.organizer_presenter")
           end
 
@@ -37,7 +38,7 @@ module Decidim
               data: {
                 tooltip: true,
                 "disable-hover": false
-              }
+              }, rel: "noopener"
             )
           end
 

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

@@ -8,6 +8,7 @@ module Decidim
     class MeetingPresenter < SimpleDelegator
       include Decidim::TranslationsHelper
       include Decidim::ResourceHelper
+      include Decidim::SanitizeHelper
 
       def meeting
         __getobj__
@@ -17,6 +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.render(links: links).html_safe
         end

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

@@ -36,6 +36,7 @@ module Decidim
 
         def filter_by_search(invites)
           return invites if @query.blank?
+
           invites.joins(:user).where(
             User.arel_table[:name].lower.matches("%#{@query}%").or(User.arel_table[:email].lower.matches("%#{@query}%"))
           )

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

@@ -14,6 +14,7 @@ module Decidim
           @registry = []
           cumulative.each do |key, cumulative_value|
             next if cumulative_value.zero?
+
             quantity_value = quantity[key] || 0
             category_id, space_type, space_id = key
             record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,

data/app/serializers/decidim/meetings/registration_serializer.rb

@@ -31,6 +31,7 @@ module Decidim
 
       def normalize_body(answer)
         return "" unless answer
+
         answer.body || answer.choices.pluck(:body)
       end
     end

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

@@ -30,6 +30,7 @@ module Decidim
         # Returns a String.
         def calendar
           return if events.blank?
+
           <<~CALENDAR.gsub("\n\n", "\n")
             BEGIN:VCALENDAR\r
             VERSION:2.0\r

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

@@ -9,5 +9,5 @@
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
-  <input type="text" value="<%= "#{path}" %>" readonly />
+  <input type="text" value="<%= "#{path}" %>" readonly>
 </div>

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

@@ -4,11 +4,11 @@
   </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 %>
+      <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true %>
     </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 %>
+      <%= form.translated :editor, :description, hashtaggable: true %>
     </div>
 
     <div class="row column">

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

@@ -28,7 +28,7 @@
           <% meetings.each do |meeting| %>
             <tr data-id="<%= meeting.id %>">
               <td>
-                <%= present(meeting).title %><br />
+                <%= present(meeting).title %><br>
               </td>
               <td>
                 <% if meeting.start_time %>

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

@@ -10,7 +10,7 @@
           <strong class="text-uppercase"><%= translated_attribute(agenda_item.title) %></strong>&nbsp;
           <span class="text-small"><%= display_duration_agenda_items(agenda_item.id, index, agenda_items_times) %></span>
         </h5>
-        <hr class="reset m-none mb-s" />
+        <hr class="reset m-none mb-s">
         <p><%= translated_attribute(agenda_item.description).html_safe %></p>
 
         <% if agenda_item.agenda_item_children.presence %>

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

@@ -18,11 +18,11 @@
           <div class="card--list__item">
             <div class="card--list__text">
               <div>
-                <%= link_to meeting.minutes.video_url, meeting.minutes.video_url, target: "_blank" %>
+                <%= link_to meeting.minutes.video_url, meeting.minutes.video_url, target: "_blank", rel: "noopener" %>
               </div>
             </div>
             <div class="card--list__data">
-              <%= link_to meeting.minutes.video_url, target: "_blank", class: "card--list__data__icon" do %>
+              <%= link_to meeting.minutes.video_url, target: "_blank", class: "card--list__data__icon", rel: "noopener" do %>
                 <%= icon "external-link" %>
               <% end %>
             </div>
@@ -32,11 +32,11 @@
           <div class="card--list__item">
             <div class="card--list__text">
               <div>
-                <%= link_to meeting.minutes.audio_url, meeting.minutes.audio_url, target: "_blank" %>
+                <%= link_to meeting.minutes.audio_url, meeting.minutes.audio_url, target: "_blank", rel: "noopener" %>
               </div>
             </div>
             <div class="card--list__data">
-              <%= link_to meeting.minutes.audio_url, target: "_blank", class: "card--list__data__icon" do %>
+              <%= link_to meeting.minutes.audio_url, target: "_blank", class: "card--list__data__icon", rel: "noopener" do %>
                 <%= icon "external-link" %>
               <% end %>
             </div>

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

@@ -146,6 +146,3 @@ edit_link(
 <%= attachments_for meeting %>
 <%= comments_for meeting %>
 <%= pad_iframe_for meeting %>
-
-<%= javascript_include_tag "decidim/proposals/social_share" %>
-<%= stylesheet_link_tag "decidim/proposals/social_share" %>

data/app/views/decidim/participatory_spaces/_conference_venues.html.erb

@@ -1,5 +1,5 @@
 <% if meetings.any? %>
-<hr class="reset mt-none mb-m" />
+<hr class="reset mt-none mb-m">
 <section class="section" id="venues">
   <h4 class="section-heading"><%= t("conference_venues", scope: "decidim.meetings") %></h4>
   <div class="row">

data/config/locales/fr.yml

@@ -437,10 +437,10 @@ fr:
         upcoming_meeting: Prochaine rencontre
     resource_links:
       meetings_through_proposals:
-        meeting_result: 'Projets associés :'
+        meeting_result: 'Résultats associés :'
         result_meeting: 'Rencontres associées :'
       proposals_from_meeting:
-        meeting_proposal: 'Propositions liées:'
+        meeting_proposal: 'Propositions créées lors de cette rencontre :'
         proposal_meeting: 'Rencontres associées :'
   devise:
     mailer:

data/config/locales/nl.yml

@@ -427,12 +427,12 @@ nl:
       participatory_process_groups:
         highlighted_meetings:
           past_meetings: Vorige events
-          upcoming_meetings: Toekomstige events
+          upcoming_meetings: Aankomende vergaderingen
     participatory_spaces:
       highlighted_meetings:
         past_meetings: Vorige events
         see_all: Alles zien (%{count})
-        upcoming_meetings: Toekomstige events
+        upcoming_meetings: Aankomende vergaderingen
       upcoming_meeting_for_card:
         upcoming_meeting: Aankomende vergadering
     resource_links:

data/lib/decidim/meetings/test/factories.rb

@@ -42,7 +42,7 @@ FactoryBot.define do
       closing_report { generate_localized_title }
       attendees_count { rand(50) }
       contributions_count { rand(50) }
-      attending_organizations { Array.new(3) { Faker::GameOfThrones.house }.join(", ") }
+      attending_organizations { Array.new(3) { Faker::TvShows::GameOfThrones.house }.join(", ") }
       closed_at { Time.current }
     end
 

data/lib/decidim/meetings/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Meetings
     def self.version
-      "0.18.1"
+      "0.19.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -46,56 +46,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: icalendar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: jquery-tmpl-rails
   requirement: !ruby/object:Gem::Requirement
@@ -116,14 +116,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: searchlight
   requirement: !ruby/object:Gem::Requirement
@@ -144,56 +144,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 description: A meetings component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com