decidim-meetings 0.29.1 → 0.29.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e7f819ca23ee377f7c6b3f36c884edeb1db3793de73e78445948e49b62a5bad
-  data.tar.gz: 6b463bf3658a7c1d0b3d9ca26a25eb800ca7ec70da30b6e11cc7db00f0522f17
+  metadata.gz: 1914015424af6badd9b0449162f29d9531f45777617c85abf7afc8bcfc7fc439
+  data.tar.gz: a60c1966bd2920683d25767d342118657da641bbf0332d3b19a4a038602810d6
 SHA512:
-  metadata.gz: 0c18cde6a37d3e4c56dba6e951c3dd27e4af50f9895156796b7d4908001ca7534099874f6279bbb5cc1b49ebc7106e7d5b9fb0b5c9dfbc5c3fc8626c1ea8be56
-  data.tar.gz: 67312f06fa33b06598e930f97cd37ef6eabf9218499e725fa4d0e25bd36d181335efd5e772c1c51036d4caad3df1727c0974afb3a9b66d038895dd8df9e48af6
+  metadata.gz: b299704d14a16389756ded8685c48e5e5e4283640fe8418e7be764a52f8fa837325d8659b3a9686bef37f60467fe8186942251cf9439b954b1353681984f6491
+  data.tar.gz: ffd91e602170b5a2479c63565c01f990daa13ef2db41561b23c4c5c18319a8a3b51ba921bae5dec70f22c0235a0fa3590eb0dde046676e7da92df2769fce70e2

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

@@ -15,9 +15,11 @@
     </div>
   </div>
 
-  <%= static_map %>
-
-  <% if online? %>
+  <% if display_map? %>
+    <%= static_map %>
+  <% elsif online? %>
     <%= cell("decidim/address", meeting, online: true) %>
+  <% else %>
+    <%= cell("decidim/address", meeting) %>
   <% end %>
 </div>

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

@@ -14,7 +14,7 @@ module Decidim
       delegate :snippets, to: :controller
 
       def static_map
-        return render :static_map if display_map?
+        return render :static_map
       end
 
       def year

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

@@ -13,6 +13,11 @@ module Decidim
         "card__calendar-list__reset"
       end
 
+      # Renders the date in the meeting card list
+      def has_image?
+        true
+      end
+
       def image
         render
       end

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

@@ -7,7 +7,7 @@ module Decidim
       class CloseMeetingForm < Decidim::Form
         include TranslatableAttributes
 
-        translatable_attribute :closing_report, String
+        translatable_attribute :closing_report, Decidim::Attributes::RichText
         attribute :video_url, String
         attribute :audio_url, String
         attribute :closing_visible, Boolean, default: true

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

@@ -8,7 +8,7 @@ module Decidim
         include TranslatableAttributes
 
         translatable_attribute :title, String
-        translatable_attribute :description, String
+        translatable_attribute :description, Decidim::Attributes::RichText
 
         attribute :duration, Integer, default: 0
         attribute :parent_id, Integer

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

@@ -23,7 +23,7 @@ module Decidim
         attribute :iframe_access_level, String
 
         translatable_attribute :title, String
-        translatable_attribute :description, String
+        translatable_attribute :description, Decidim::Attributes::RichText
         translatable_attribute :location, String
         translatable_attribute :location_hints, String
 

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

@@ -15,8 +15,8 @@ module Decidim
         attribute :available_slots, Integer
         attribute :reserved_slots, Integer
 
-        translatable_attribute :registration_terms, String
-        translatable_attribute :registration_email_custom_content, String
+        translatable_attribute :registration_terms, Decidim::Attributes::RichText
+        translatable_attribute :registration_email_custom_content, Decidim::Attributes::RichText
 
         validates :registration_terms, translatable_presence: true, if: ->(form) { form.registrations_enabled? }
         validates :available_slots, :reserved_slots, presence: true, if: ->(form) { form.registrations_enabled? }

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

@@ -6,29 +6,17 @@
   }
 
   &__calendar {
-    @apply w-14 flex flex-col justify-start rounded bg-background text-center;
+    @apply order-first flex flex-col min-w-48 rounded bg-background text-center md:w-14;
 
     &:only-child &-month {
       @apply rounded-t;
     }
 
     &-container {
-      @apply grid grid-cols-[auto_1fr] md:grid-cols-[auto_1fr_1fr] items-center gap-0 md:gap-x-5 border-4 border-background rounded md:h-[140px] overflow-hidden;
+      @apply flex flex-wrap flex-col md:flex-row gap-2 border-4 border-background rounded;
 
-      > *:nth-child(2) {
-        @apply p-4 md:p-0;
-
-        &:not(:last-child) {
-          @apply col-span-2 md:col-auto order-2 md:order-1;
-        }
-
-        &:last-child {
-          @apply md:col-span-2 pr-4;
-        }
-      }
-
-      > *:nth-child(3) {
-        @apply order-1 md:order-2 h-[135px] md:h-full;
+      ul {
+        @apply flex-1 p-2;
       }
     }
 
@@ -55,7 +43,7 @@
     }
 
     &__lg {
-      @apply w-fit justify-center [&>*]:px-2 min-w-24 h-[8.5rem];
+      @apply flex min-w-48;
     }
 
     &__lg &-month {

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

@@ -4,12 +4,17 @@ module Decidim
   module Meetings
     class Permissions < Decidim::DefaultPermissions
       def permissions
-        return permission_action unless user
-
         # Delegate the admin permission checks to the admin permissions class
         return Decidim::Meetings::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
         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))
+          return permission_action
+        end
+
+        return permission_action unless user
+
         case permission_action.subject
         when :answer
           case permission_action.action

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

@@ -74,7 +74,7 @@ module Decidim
         return unless meeting
 
         handle_locales(meeting.registration_email_custom_content, all_locales) do |content|
-          renderer = Decidim::ContentRenderers::HashtagRenderer.new(sanitized(content))
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(decidim_sanitize_editor_admin(content))
           renderer.render(links:).html_safe
         end
       end
@@ -135,10 +135,6 @@ module Decidim
 
         proposals.map.with_index { |proposal, index| "#{index + 1}) #{proposal.title}\n" }
       end
-
-      def sanitized(content)
-        decidim_sanitize_editor(content)
-      end
     end
   end
 end

data/app/views/decidim/meetings/registration_mailer/confirmation.html.erb

@@ -6,5 +6,5 @@
 <% if @meeting.customize_registration_email? %>
   <p><%= present(@meeting).registration_email_custom_content %></p>
 <% end %>
-
+<br>
 <p class="email-instructions"><%= t(".details") %></p>

data/app/views/decidim/meetings/shared/_index.js.erb

@@ -4,13 +4,12 @@ $meetings.html('<%= j(render partial: "decidim/meetings/shared/meetings", locals
 var $urlCalendarUrl = $('#urlCalendarUrl');
 $urlCalendarUrl.val("<%= short_url(route_name: "calendar", params: { filter: params.fetch(:filter, {}).try(:to_unsafe_hash) }) %>");
 
-var meeting_frame = document.getElementById("meeting_frame");
-meeting_frame.dataset.filteredPath = "<%= request.fullpath %>"
-
 var $map = $("#map");
 var controller = $map.data("map-controller");
 if (controller) {
   var markerData = JSON.parse('<%= escape_javascript meetings_data_for_map(search.result).to_json.html_safe %>');
   controller.clearMarkers();
-  controller.addMarkers(markerData);
+  if (markerData.length > 0){
+    controller.addMarkers(markerData);
+  }
 }

data/config/locales/ar.yml

@@ -205,7 +205,6 @@ ar:
         attachment_collections: المجلدات
         attachments: مرفقات
         close: قريب
-        confirm_destroy: هل أنت متأكد أنك تريد حذف هذا الاجتماع؟
         destroy: حذف
         edit: تعديل
         invalid_destroy:
@@ -465,6 +464,9 @@ ar:
           see_all: عرض كافة الاجتماعات
           see_all_withdrawn: عرض جميع الاجتماعات المسحوبة
           text_banner: أنت تستعرض قائمة الاجتماعات التي تم سحبها من قبل مؤلفيها. %{go_back_link}.
+        meeting:
+          close_meeting: اجتماع قريب
+          edit_meeting: تعديل الاجتماعات
         meetings:
           upcoming_meetings_warning: حاليًا ، لا توجد اجتماعات مجدولة ، ولكن يمكنك هنا العثور على جميع الاجتماعات السابقة المدرجة.
         new:

data/config/locales/bg.yml

@@ -235,7 +235,6 @@ bg:
         attachment_collections: Папки
         attachments: Прикачени файлове
         close: Затвори
-        confirm_destroy: Наистина ли искате да изтриете тази среща?
         destroy: Изтрий
         edit: Редактирай
         invalid_destroy:

data/config/locales/bn-BD.yml

@@ -0,0 +1 @@
+bn:

data/config/locales/bs-BA.yml

@@ -0,0 +1,8 @@
+---
+bs:
+  decidim:
+    meetings:
+      admin:
+        registrations:
+          form:
+            recommendation_message: Zbog vaše privatnosti preporučujemo da obrišete ovaj prijavni formular kada vam više ne treba, obično 3 meseca nakon što se sastanak završio.

data/config/locales/ca.yml

@@ -533,7 +533,7 @@ ca:
           see_all_withdrawn: Veure totes les trobades cancel·lades
           text_banner: Estàs veient un llistat de trobades cancel·lades per les seves autores. %{go_back_link}.
         meeting:
-          close_meeting: Tancar la trobada
+          close_meeting: Tancar trobada
           edit_close_meeting: Editar l'informe de la trobada
           edit_meeting: Editar la trobada
           join_meeting: Unir-se a la trobada

data/config/locales/cs.yml

@@ -116,7 +116,7 @@ cs:
               'false': Minulé
               'true': Nadcházející
           scope_id_eq:
-            label: Oblast působnosti
+            label: Rozsah
           with_any_origin:
             label: Původ
             values:
@@ -153,6 +153,7 @@ cs:
         actions:
           comment: Komentář
           join: Přidat se
+          reply_poll: Odpověď ankety
         name: Setkání
         settings:
           global:
@@ -165,7 +166,7 @@ cs:
             maps_enabled: Mapy povoleny
             registration_code_enabled: Registrační kód povolen
             resources_permissions_enabled: Nastavení oprávnění lze nastavit pro každou schůzku
-            scope_id: Oblast působnosti
+            scope_id: Rozsah
             scopes_enabled: Oblasti působnosti povoleny
             terms_and_conditions_url_for_meeting_creators: URL pro Zásady a podmínky ke schůzce tvůrců
           step:
@@ -240,7 +241,7 @@ cs:
         attachment_collections: Složky
         attachments: Přílohy
         close: Zavřít
-        confirm_destroy: Opravdu chcete tuto schůzku smazat?
+        confirm_destroy: Opravdu chcete smazat tuto schůzi?
         destroy: Odstranit
         edit: Upravit
         invalid_destroy:
@@ -546,7 +547,7 @@ cs:
           see_all_withdrawn: Zobrazit všechny stažené schůzky
           text_banner: Zobrazujete seznam schůzek stažených jejich autory. %{go_back_link}.
         meeting:
-          close_meeting: Ukončit schůzku
+          close_meeting: Zavřete schůzku
           edit_close_meeting: Upravit zprávu schůzky
           edit_meeting: Upravit schůzku
           join_meeting: Připojit se ke schůzce