decidim-meetings 0.28.1 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2938d2f32497611f571869b77a695164b51a47bcac475980697e0fb05b5ee681
-  data.tar.gz: 7eeb90d0095cfd435bc7e1a27bfebff6d9d48eacfb98fa3fcf12fa7f72d6a46e
+  metadata.gz: b39a9cc837cdf7ceb50a11600d77bf52bc43b826f59904a547ded94bd4ff4748
+  data.tar.gz: 87830a9f87a179d747f8fd14749abe9774f124778b5ba6bdc98591bc42f39c5f
 SHA512:
-  metadata.gz: 4bd4972aefef8559a1b546210dd95d71d1db90e64406ab796ad6314a3d92a8c6dfbde876394fe68b62194a492f1a4374687b1ae50325cd131e37ef600c5e0076
-  data.tar.gz: 9d2d4b400fb87da7ee84d7d8ef1c39e78a8882be1b53465b72c76adbf551af0590fabb312a458235fcf953a5b4f0e3d6b7191e4c8a0a38a0aae2489e92ccaf9d
+  metadata.gz: f9376c59d4176d0df307fa963890ed3c35dd5bf3b4469087e6972348cdd08d78f2f705e820ee19cba564cc70566f6cc999e80cb65dd8fcbbd49cbdad405d283d
+  data.tar.gz: 1bffbca3121562dcb32af901f743817e004ab5dff16ec2f5dba433910cfb130d87947db7fd4f2cef00c9f0825d0e57111cca66e41a7bbb3745c10124b6586b1f

data/app/cells/decidim/meetings/join_meeting_button/registration_modal.erb

@@ -8,7 +8,7 @@
         <div class="form__wrapper">
           <%= cell("decidim/represent_user_group", form) %>
           <%= cell("decidim/public_participation", form) %>
-          <span class="meeting__registration-modal__terms"><%= registration_terms_text %></span>
+          <div class="meeting__registration-modal__terms"><%= registration_terms_text %></div>
         </div>
       </div>
     </div>

data/app/cells/decidim/meetings/meeting_l/image.erb

@@ -1,5 +1,5 @@
 <time class="card__calendar" datetime="<%= meeting.start_time.iso8601 %>">
-  <div class="card__calendar-month"><%= l(meeting.start_time, format: "%b") %></div>
-  <div class="card__calendar-day"><%= l(meeting.start_time, format: "%d") %></div>
-  <div class="card__calendar-year"><%= l(meeting.start_time, format: "%Y") %></div>
+  <span class="card__calendar-month"><%= l(meeting.start_time, format: "%b") %></span>
+  <span class="card__calendar-day"><%= l(meeting.start_time, format: "%d") %></span>
+  <span class="card__calendar-year"><%= l(meeting.start_time, format: "%Y") %></span>
 </time>

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

@@ -170,7 +170,7 @@ module Decidim
       end
 
       def can_be_joined_by?(user)
-        !closed? && registrations_enabled? && can_participate?(user)
+        !started? && registrations_enabled? && can_participate?(user)
       end
 
       def can_register_invitation?(user)
@@ -182,6 +182,10 @@ module Decidim
         closed_at.present?
       end
 
+      def started?
+        start_time < Time.current
+      end
+
       def past?
         end_time < Time.current
       end

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

@@ -15,10 +15,6 @@ module Decidim
       class MeetingPresenter < Decidim::Log::BasePresenter
         private
 
-        def resource_presenter
-          @resource_presenter ||= Decidim::Meetings::Log::ResourcePresenter.new(action_log.resource, h, action_log.extra["resource"])
-        end
-
         def diff_fields_mapping
           {
             address: :string,

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

@@ -10,7 +10,7 @@ module Decidim
           def present
             return unless value
 
-            renderer = Decidim::ContentRenderers::HashtagRenderer.new(h.translated_attribute(value))
+            renderer = Decidim::ContentRenderers::HashtagRenderer.new(h.decidim_escape_translated(value))
             renderer.render(links: false).html_safe
           end
         end

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

@@ -38,11 +38,9 @@ module Decidim
 
       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 = meeting.official? ? space_admins(component) : [meeting.author]
             authors.each do |author|
               send_notif = author.notification_settings.fetch("close_meeting_reminder", "1")
               next unless send_notif == "1"
@@ -60,8 +58,16 @@ module Decidim
         end
       end
 
-      def global_admins
-        @global_admins ||= Decidim::User.where(admin: true).all
+      def space_admins(component)
+        @space_admins ||= begin
+          space_admins = if component.participatory_space.respond_to?(:user_roles)
+                           component.participatory_space.user_roles(:admin).collect(&:user)
+                         else
+                           []
+                         end
+          global_admins = component.organization.admins
+          (global_admins + space_admins).uniq
+        end
       end
     end
   end

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

@@ -32,7 +32,6 @@
             data: { confirm: t("withdraw_confirmation_html", scope: "decidim.meetings.meetings.show") }
           ) do %>
           <span><%= t("withdraw_meeting", scope:"decidim.meetings.meetings.show") %></span>
-          <%= icon "pencil-line" %>
       <% end %>
     <% end %>
   </section>

data/config/locales/ar.yml

@@ -396,7 +396,6 @@ ar:
         new_meeting: 'اجتماع جديد:'
       layouts:
         live_event:
-          administrate: إدارة
           close: إغلاق
           questions: الأسئلة
       mailer: