decidim-meetings 0.29.2 → 0.29.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1914015424af6badd9b0449162f29d9531f45777617c85abf7afc8bcfc7fc439
-  data.tar.gz: a60c1966bd2920683d25767d342118657da641bbf0332d3b19a4a038602810d6
+  metadata.gz: c62bb7e3ede2e0107a2106b921f58139bfb23877893db713d1408032579da53e
+  data.tar.gz: 5fe50d58ea182b1889d8fe590c719e4cdf93bed773e6e97b432f814023c4fb90
 SHA512:
-  metadata.gz: b299704d14a16389756ded8685c48e5e5e4283640fe8418e7be764a52f8fa837325d8659b3a9686bef37f60467fe8186942251cf9439b954b1353681984f6491
-  data.tar.gz: ffd91e602170b5a2479c63565c01f990daa13ef2db41561b23c4c5c18319a8a3b51ba921bae5dec70f22c0235a0fa3590eb0dde046676e7da92df2769fce70e2
+  metadata.gz: 2ad378367071384cbed6a9294ba913d34b42383bfd820ca7c65a90c38a70182963ed9399dd2f45910f4fd3a37c204bff81a234c0f7991c95c1ebb4254622e2ac
+  data.tar.gz: d31b48902817907e446c32dea541317d75346e89934328d1c98d8dbb5a76ab265a525896743102956a1beefeace6d0080df22c9bdb0d892d47a572577c999982

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

@@ -1,17 +1,17 @@
 <div class="meeting__calendar-container">
   <div class="meeting__calendar meeting__calendar__lg">
     <div class="meeting__calendar-month">
-      <span><%= l(start_time, format: !same_month? ? "%b" : "%B") %></span>
-      <span class="meeting__calendar-separator"><%= "-" if !same_month? %></span>
-      <span><%= l(end_time, format: "%b") if !same_month? %></span>
+      <p><%= l(start_time, format: !same_month? ? "%b" : "%B") %></p>
+      <p class="meeting__calendar-separator"><%= "-" if !same_month? %></p>
+      <p><%= l(end_time, format: "%b") if !same_month? %></p>
     </div>
     <div class="meeting__calendar-day">
-      <span><%= l(start_time, format: "%d") %></span>
-      <span class="meeting__calendar-separator"><%= "-" if !same_day? || !same_month? %></span>
-      <span><%= l(end_time, format: "%d") if !same_day? || !same_month? %></span>
+      <p><%= l(start_time, format: "%d") %></p>
+      <p class="meeting__calendar-separator"><%= "-" if !same_day? || !same_month? %></p>
+      <p><%= l(end_time, format: "%d") if !same_day? || !same_month? %></p>
     </div>
     <div class="meeting__calendar-year">
-      <span><%= year %></span>
+      <p><%= year %></p>
     </div>
   </div>
 

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

@@ -79,7 +79,7 @@ module Decidim
             end
           else
             user.name = form.name
-            user.nickname = User.nicknamize(user.name, organization: user.organization)
+            user.nickname = User.nicknamize(user.name, user.decidim_organization_id)
             invite_user_to_sign_up
             create_invitation!
           end

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

@@ -59,10 +59,9 @@ module Decidim
       def show
         raise ActionController::RoutingError, "Not Found" unless meeting
 
-        return if meeting.current_user_can_visit_meeting?(current_user)
+        enforce_permission_to(:read, :meeting, meeting:)
 
-        flash[:alert] = I18n.t("meeting.not_allowed", scope: "decidim.meetings")
-        redirect_to(ResourceLocatorPresenter.new(meeting).index)
+        return if meeting.current_user_can_visit_meeting?(current_user)
       end
 
       def edit

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

@@ -317,11 +317,6 @@ module Decidim
           )
       end
 
-      # Public: Overrides the `reported_content_url` Reportable concern method.
-      def reported_content_url
-        ResourceLocatorPresenter.new(self).url
-      end
-
       # Public: Overrides the `reported_attributes` Reportable concern method.
       def reported_attributes
         [:description]

data/app/packs/stylesheets/decidim/meetings/_item.scss

@@ -35,7 +35,7 @@
     &-month,
     &-day,
     &-year {
-      @apply inline-flex items-center justify-evenly empty:[&>span]:hidden;
+      @apply inline-flex items-center justify-evenly empty:[&>p]:hidden;
     }
 
     &-separator {
@@ -64,7 +64,7 @@
   }
 
   &__grid {
-    @apply grid grid-cols-4 gap-x-12 gap-y-4;
+    @apply grid grid-cols-2 gap-x-12 gap-y-4 md:grid-cols-4;
   }
 
   &__online {

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

@@ -9,7 +9,7 @@ module Decidim
         return permission_action if permission_action.scope != :public
 
         if permission_action.subject == :meeting && permission_action.action == :read
-          toggle_allow(!meeting&.hidden? && meeting&.current_user_can_visit_meeting?(user))
+          toggle_allow(user_has_any_role?(user, meeting.participatory_space, broad_check: true) || (!meeting&.hidden? && meeting&.current_user_can_visit_meeting?(user)))
           return permission_action
         end
 

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

@@ -21,6 +21,8 @@ module Decidim
       private
 
       def serialize_answers
+        return [] unless resource.meeting.questionnaire
+
         Decidim::Forms::UserAnswersSerializer.new(
           resource.meeting.questionnaire.answers.where(user: resource.user)
         ).serialize

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

@@ -9,8 +9,8 @@
   <div class="space-y-8">
     <h3 id="dialog-title-calendarShare" class="h3"><%= t(".calendar_url") %></h3>
 
-    <div id="dialog-desc-calendarShare" class="meeting-list__modal-text"><%= t(".copy_calendar_url_description") %></div>
-    <div class="meeting-list__modal-text"><%= t(".copy_calendar_url_explanation") %></div>
+    <p id="dialog-desc-calendarShare" class="meeting-list__modal-text"><%= t(".copy_calendar_url_description") %></p>
+    <p class="meeting-list__modal-text"><%= t(".copy_calendar_url_explanation") %></p>
 
     <div class="meeting-list__modal-input">
       <input id="urlCalendarUrl" type="text" title="<%= t(".calendar_url") %>" value="<%= "#{path}" %>" readonly>

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

@@ -1,3 +1,12 @@
+<% add_decidim_meta_tags(
+  description: translated_attribute(current_component.participatory_space.try(:description)),
+  title: t("decidim.components.pagination.page_title",
+           component_name: translated_attribute(current_component.name),
+           current_page: meetings.current_page,
+           total_pages: meetings.total_pages ),
+  url: meetings_url,
+  resource: current_component) %>
+
 <%= render partial: "decidim/meetings/shared/index", locals: {
       display_map: Decidim::Map.available?(:geocoding, :dynamic) && current_component.settings.maps_enabled? && search.result.not_online.exists?,
       display_announcement: true,

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

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t("title", scope: "decidim.meetings.meetings.new")) %>
 <%= render layout: "layouts/decidim/shared/layout_center" do %>
   <div class="text-center py-10">
     <h1 class="title-decorator inline-block text-left">

data/app/views/decidim/meetings/shared/_meetings.html.erb

@@ -11,7 +11,7 @@
 <% if meetings.length.zero? %>
   <%= cell("decidim/announcement", t("decidim.meetings.meetings.meetings.no_meetings_warning"), callout_class: "warning" ) %>
 <% else %>
-  <h2 class="h5 md:h3 decorator"><%= t("meetings_count", scope: "decidim.meetings.meetings.count", count: meetings.total_count) %></h2>
+  <h2 class="h5 md:h3 decorator" aria-live="polite" aria-atomic="true"><%= t("meetings_count", scope: "decidim.meetings.meetings.count", count: meetings.total_count) %></h2>
 
   <%= cell("decidim/announcement", t("decidim.meetings.meetings.meetings.upcoming_meetings_warning"), callout_class: "warning" ) if @forced_past_meetings %>
 

data/config/locales/ar.yml

@@ -310,8 +310,6 @@ ar:
         registrations:
           edit:
             save: حفظ
-            validate: التحقق من صحة
-            validate_registration_code: التحقق من صحة رمز التسجيل
           form:
             available_slots_help: اتركه إلى 0 إذا كان لديك فتحات غير محدودة المتاحة.
             invites: دعوات
@@ -330,9 +328,6 @@ ar:
           update:
             invalid: حدثت مشكلة أثناء حفظ إعدادات التسجيل.
             success: تم حفظ إعدادات تسجيل الاجتماع بنجاح.
-          validate_registration_code:
-            invalid: رمز التسجيل هذا غير صالح.
-            success: تم التحقق من صحة رمز التسجيل بنجاح.
       admin_log:
         invite:
           create: "%{user_name} دعا %{attendee_name} للانضمام إلى اجتماع %{resource_name} في الفضاء %{space_name}"
@@ -472,7 +467,6 @@ ar:
         new:
           back: العودة
           create: إنشاء
-          title: إنشاء اجتماعك
         registration_confirm:
           cancel: إلغاء
           confirm: تؤكد

data/config/locales/bg.yml

@@ -373,8 +373,6 @@ bg:
         registrations:
           edit:
             save: Запази
-            validate: Потвърди
-            validate_registration_code: Валидиране на регистрационния код
           form:
             available_slots_help: Оставете 0, ако разполагате с неограничен брой места.
             invites: Покани
@@ -390,9 +388,6 @@ bg:
           update:
             invalid: Възникна проблем при запазването на настройките за регистрация.
             success: Настройките за регистрация бяха запазени успешно.
-          validate_registration_code:
-            invalid: Регистрационният код е невалиден.
-            success: Регистрационният код беше валидиран успешно.
       admin_log:
         invite:
           create: "%{user_name} покани %{attendee_name} да се присъедини към срещата %{resource_name} в пространството %{space_name}"
@@ -544,7 +539,6 @@ bg:
         new:
           back: Назад
           create: Създаване
-          title: Създайте среща
         registration_confirm:
           cancel: Отказ
           confirm: Потвърждаване
@@ -597,12 +591,7 @@ bg:
             title: Заглавие
       polls:
         answers:
-          index:
-            administrate: Администриране
-            title: Анкета
           index_admin:
-            back_to_meeting: Назад към срещата
-            title: Администриране на анкета
             view_poll: Вижте анкетата
         questions:
           closed_question: