decidim-conferences 0.27.5 → 0.27.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98a81bd733a850a73a9c9cbd536bc8496069fbeaff54977c565e35025a2e882e
-  data.tar.gz: 90f1cc1a169cc532b88b743dda0560997f9f31d57291c0d46b7f436d6b409151
+  metadata.gz: 873b7b4885e630d523b8fcaf40bc12581b95e52d9346f1516fe7e8398922ef45
+  data.tar.gz: f243423b5405868cf22de819d876bb3064ac1e744d350c94c318d1c31c4b672c
 SHA512:
-  metadata.gz: 7c92d693c990153d68b3b43d236ab011fa59f6d3ee3af05dd278458c6e92712c9a64ce805be50b1d0294748af6f98df196437995c4c4f51ace4c5d8ae38da627
-  data.tar.gz: 62a28b10eb414cb37916f8d75f42d532efc0a5266ae7846acf263f9b7ffa4d77adf65454f46a57c68401816b8cce5141ee984ad8ad8b7531b5b586a7dc0eef61
+  metadata.gz: 1fecffcbb0c34107a3c4e70342b0fb6116275ecf86bac4df7b518048fb3a83e14a97e02af1526fc997b8358647b902de7d64118aacd6535e3f05524e9730d33a
+  data.tar.gz: 8dda12135eaeae94872946c580bc87c222f98eedab80f62a6ab426a1dba2fa46489cac55fae7d0d53af9037b4de7f005d613dd37f456f1f57764fff9c3dc500b

data/app/cells/decidim/conferences/conference_address/show.erb

@@ -1,11 +1,11 @@
 <div class="mb-s">
   <% if model.respond_to? :location %>
     <div>
-      <strong><%= translated_attribute model.location %></strong><br>
+      <strong><%= decidim_escape_translated model.location %></strong><br>
     </div>
   <% end %>
   <div class="text-medium"><%= model.address %></div>
   <% if model.respond_to? :location_hints %>
-    <div class="text-medium"><%= translated_attribute model.location_hints %></div>
+    <div class="text-medium"><%= decidim_escape_translated model.location_hints %></div>
   <% end %>
 </div>

data/app/cells/decidim/conferences/conference_m_cell.rb

@@ -14,10 +14,6 @@ module Decidim
 
       private
 
-      def title
-        decidim_html_escape(super)
-      end
-
       def has_image?
         true
       end

data/app/cells/decidim/conferences/conference_speaker_cell.rb

@@ -60,7 +60,7 @@ module Decidim
       def short_bio
         return unless model.short_bio.presence
 
-        translated_attribute model.short_bio
+        decidim_escape_translated model.short_bio
       end
 
       def twitter_handle

data/app/cells/decidim/conferences/content_blocks/highlighted_conferences/show.erb

@@ -10,7 +10,7 @@
               <div aria-hidden="true" class="card__image-top"
                 style="background-image:url('<%= conference.attached_uploader(:hero_image).path %>')"></div>
               <div class="card__content">
-                <span class="card__title card__link"><%= translated_attribute conference.title %></span>
+                <span class="card__title card__link"><%= decidim_escape_translated conference.title %></span>
               </div>
             <% end %>
           </div>

data/app/cells/decidim/conferences/photo_cell.rb

@@ -26,7 +26,7 @@ module Decidim
       end
 
       def title
-        translated_attribute model.title
+        decidim_escape_translated model.title
       end
 
       def short_description

data/app/controllers/decidim/conferences/conference_widgets_controller.rb

@@ -5,10 +5,16 @@ module Decidim
     class ConferenceWidgetsController < Decidim::WidgetsController
       helper Decidim::SanitizeHelper
 
+      def show
+        enforce_permission_to :embed, :conference, conference: model if model
+
+        super
+      end
+
       private
 
       def model
-        @model ||= Conference.find_by(slug: params[:conference_slug])
+        @model ||= Conference.where(organization: current_organization).published.find_by(slug: params[:conference_slug])
       end
 
       def current_participatory_space
@@ -18,6 +24,10 @@ module Decidim
       def iframe_url
         @iframe_url ||= conference_conference_widget_url(model)
       end
+
+      def permission_class_chain
+        ::Decidim.permissions_registry.chain_for(::Decidim::Conferences::ApplicationController)
+      end
     end
   end
 end

data/app/events/decidim/conferences/conference_registration_notification_event.rb

@@ -4,6 +4,7 @@ module Decidim
   module Conferences
     class ConferenceRegistrationNotificationEvent < Decidim::Events::BaseEvent
       include Decidim::Events::NotificationEvent
+      include Decidim::SanitizeHelper
 
       def notification_title
         I18n.t("notification_title", **i18n_options).html_safe
@@ -12,10 +13,19 @@ module Decidim
       def i18n_options
         {
           resource_title: resource_title,
+          resource_path: resource_path,
           resource_url: resource_url,
           scope: event_name
         }
       end
+
+      def resource_title
+        return unless resource
+
+        title = decidim_sanitize_translated(resource.title)
+
+        Decidim::ContentProcessor.render_without_format(title, links: false).html_safe
+      end
     end
   end
 end

data/app/permissions/decidim/conferences/permissions.rb

@@ -16,6 +16,7 @@ module Decidim
         if permission_action.scope == :public
           public_list_conferences_action?
           public_read_conference_action?
+          public_embed_conference_action?
           public_list_speakers_action?
           public_list_program_action?
           public_list_media_links_action?
@@ -131,6 +132,16 @@ module Decidim
         toggle_allow(can_manage_conference?)
       end
 
+      def public_embed_conference_action?
+        return unless permission_action.action == :embed &&
+                      [:conference, :participatory_space].include?(permission_action.subject) &&
+                      conference
+
+        return disallow! unless conference.published?
+
+        allow!
+      end
+
       def public_list_speakers_action?
         return unless permission_action.action == :list &&
                       permission_action.subject == :speakers

data/app/views/decidim/conferences/conference_program/_program_meeting.html.erb

@@ -3,7 +3,7 @@
     <%= start_time.to_s(:time) %> - <%= end_time.to_s(:time) %>
   </div>
   <div class="column medium-10 programme-title">
-      <%= link_to present(meeting).title, resource_locator(meeting).path %>
+      <%= link_to decidim_sanitize(present(meeting).title), resource_locator(meeting).path %>
   </div>
 </div>
 <div class="row">

data/config/locales/ar.yml

@@ -58,6 +58,7 @@ ar:
         conference_meeting_ids: الاجتماعات ذات الصلة
         full_name: الاسم الكامل
         position: المنصب
+        twitter_handle: معرّف X
         user_id: المستخدم
       conference_user_role:
         email: البريد الإلكتروني
@@ -440,6 +441,7 @@ ar:
           invalid: حدثت مشكلة أثناء مغادرة هذا المؤتمر.
           success: لقد تركت المؤتمر بنجاح.
       conference_speaker:
+        go_to_twitter: الذهاب إلى X
         more_info: مزيد من المعلومات
         personal_website: موقع الويب الشخصي
         show: