decidim-core 0.27.6 → 0.27.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99119ce695e1aa34d4a744deca10b822209b52253058e77548a6399cd78f0069
-  data.tar.gz: '052746495077e884e4cb8e5bc33c8bcb6af257efbee57b385b39f62404530fd5'
+  metadata.gz: 613a2587e3833271a196216ce4a8e4392511b034bc0dc3e2b20a5cb3bedf76a5
+  data.tar.gz: 1bc7b0f0bc225ea6daccbfdf06f827570208b745ad0b34b95fc0caf002a332da
 SHA512:
-  metadata.gz: e5b7a3d7779697415e7ec9badd7d4d00bd408a1f42e7c667f01b797558ba22524231273b94f3f6beeb644f7aee8692bd5d2d580a7493c84dfaa5eb563241bc58
-  data.tar.gz: 193b200909cc1fa784ccad5583b3c9593b8e6a9be31c10ab03c90ee9153075ac0d168566e7fe275bb9140c1bc53a8a42e58f84ffc9b852fe91269deef496d5a3
+  metadata.gz: e643e5ccaf5ed945eb08eb5c902229f77ebb86fd0a59792bf7d5973c747f1c9ca5d92bd716ee45e0b7a3148af086576da7034ca35d7ac167e024ed302ae85370
+  data.tar.gz: 96326656a293f01a177c3c8b34bd4454450fa2a538107c6299d9fc9aaaa92de8a7b558ae4d007ce9afcb749bfe2fef7eed989e0eebae27031819d78d6c5aaed3

data/app/cells/decidim/follow_button_cell.rb

@@ -46,7 +46,7 @@ module Decidim
 
     def render_screen_reader_title_for(resource)
       content_tag :span, class: "show-for-sr" do
-        decidim_html_escape(resource_title(resource))
+        decidim_sanitize_translated(resource_title(resource))
       end
     end
 

data/app/cells/decidim/notification/moderated.erb

@@ -0,0 +1,24 @@
+<div class="card card--widget">
+  <ul class="card-data">
+    <li class="card-data__item">
+      <div class="card__link text-center">
+        <%= resource_icon notification.resource, class: "icon--large" %>
+        <span class="text-medium mt-xs" title="<%= l(notification.created_at) %>" data-tooltip="true" data-disable-hover="false">
+          <%= notification.created_at_in_words %>
+        </span>
+      </div>
+    </li>
+    <li class="card-data__item card-data__item--expand absolutes">
+      <div class="mr-s">
+        <span class="text-small"><%= notification.event_class.constantize.model_name.human %></span>
+        <br>
+        <%= t("decidim.notifications.show.moderated") %>
+      </div>
+      <div class="right center mr-s">
+        <%= link_to model, remote: true, method: :delete, class: "mark-as-read-button" do %>
+          <%= icon "circle-x", class: "card__link", aria_label: t("mark_as_read", scope: "layouts.decidim.notifications_dashboard"), role: "img" %>
+        <% end %>
+      </div>
+    </li>
+  </ul>
+</div>

data/app/cells/decidim/notification_cell.rb

@@ -8,7 +8,11 @@ module Decidim
     include Decidim::Core::Engine.routes.url_helpers
 
     def show
-      render :show
+      if notification.event_class_instance.try(:hidden_resource?)
+        render :moderated
+      else
+        render :show
+      end
     end
 
     def notification_title

data/app/cells/decidim/version_cell.rb

@@ -50,7 +50,7 @@ module Decidim
     end
 
     def i18n(string, **params)
-      t(string, **params, scope: i18n_scope, default: t(string, **params, scope: default_i18n_scope))
+      decidim_html_escape(t(string, **params, scope: i18n_scope, default: t(string, **params, scope: default_i18n_scope)))
     end
 
     def i18n_scope

data/app/controllers/concerns/decidim/force_authentication.rb

@@ -17,7 +17,7 @@ module Decidim
     # Breaks the request lifecycle, if user is not authenticated.
     # Otherwise returns.
     def ensure_authenticated!
-      return true unless current_organization.force_users_to_authenticate_before_access_organization
+      return true unless current_organization&.force_users_to_authenticate_before_access_organization
 
       # Next stop: Let's check whether auth is ok
       unless user_signed_in?

data/app/controllers/concerns/decidim/use_organization_time_zone.rb

@@ -25,7 +25,7 @@ module Decidim
       #
       # Returns a String.
       def organization_time_zone
-        @organization_time_zone ||= current_organization.time_zone
+        @organization_time_zone ||= current_organization&.time_zone
       end
     end
   end

data/app/controllers/decidim/links_controller.rb

@@ -35,7 +35,19 @@ module Decidim
     end
 
     def external_url
-      @external_url ||= URI.parse(URI::Parser.new.escape(params[:external_url]))
+      @external_url ||= URI.parse(escape_url(params[:external_url]))
+    end
+
+    def escape_url(external_url)
+      before_fragment, fragment = external_url.split("#", 2)
+      escaped_before_fragment = URI::Parser.new.escape(before_fragment)
+
+      if fragment
+        escaped_fragment = URI::Parser.new.escape(fragment)
+        "#{escaped_before_fragment}##{escaped_fragment}"
+      else
+        escaped_before_fragment
+      end
     end
   end
 end

data/app/mailers/decidim/application_mailer.rb

@@ -7,23 +7,57 @@ module Decidim
     include LocalisedMailer
     include MultitenantAssetHost
     after_action :set_smtp
+    after_action :set_from
 
     default from: Decidim.config.mailer_sender
     layout "decidim/mailer"
 
     private
 
+    attr_reader :organization
+
     def set_smtp
-      return if @organization.nil? || @organization.smtp_settings.blank?
+      return if organization.nil? || organization.smtp_settings.blank? || organization.smtp_settings.except("from", "from_label", "from_email").all?(&:blank?)
 
-      mail.from = @organization.smtp_settings["from"].presence || mail.from
       mail.reply_to = mail.reply_to || Decidim.config.mailer_reply
       mail.delivery_method.settings.merge!(
-        address: @organization.smtp_settings["address"],
-        port: @organization.smtp_settings["port"],
-        user_name: @organization.smtp_settings["user_name"],
-        password: Decidim::AttributeEncryptor.decrypt(@organization.smtp_settings["encrypted_password"])
+        address: organization.smtp_settings["address"],
+        port: organization.smtp_settings["port"],
+        user_name: organization.smtp_settings["user_name"],
+        password: Decidim::AttributeEncryptor.decrypt(organization.smtp_settings["encrypted_password"])
       ) { |_k, o, v| v.presence || o }.compact_blank!
     end
+
+    def set_from
+      return if organization.nil?
+      return if already_defined_name_in_mail?(mail.from.first)
+
+      mail.from = sender
+    end
+
+    def sender
+      return Decidim.config.mailer_sender if return_mailer_sender?
+      return default_sender if organization.smtp_settings.blank?
+      return default_sender if organization.smtp_settings["from"].nil?
+      return default_sender if organization.smtp_settings["from"].empty?
+
+      smtp_settings_from = organization.smtp_settings["from"]
+      return smtp_settings_from if already_defined_name_in_mail?(smtp_settings_from)
+
+      email_address_with_name(smtp_settings_from, organization.name)
+    end
+
+    def default_sender
+      email_address_with_name(Decidim.config.mailer_sender, organization.name)
+    end
+
+    def already_defined_name_in_mail?(mail_address)
+      # if there is an space, there is already a name in the address
+      mail_address.match?(/ /)
+    end
+
+    def return_mailer_sender?
+      already_defined_name_in_mail?(Decidim.config.mailer_sender) && organization.smtp_settings.present?
+    end
   end
 end

data/app/presenters/decidim/admin_log/organization_presenter.rb

@@ -26,7 +26,7 @@ module Decidim
 
       def settings_attributes_mapping
         {
-          name: :string,
+          name: :i18n,
           default_locale: :locale,
           reference_prefix: :string,
           twitter_handler: :string,

data/app/presenters/decidim/log/resource_presenter.rb

@@ -10,6 +10,8 @@ module Decidim
     # overwrite `BasePresenter#resource_presenter` to return your custom resource presenter.
     # The only requirement for custom renderers is that they should respond to `present`.
     class ResourcePresenter
+      include Decidim::SanitizeHelper
+
       # Public: Initializes the presenter.
       #
       # resource - An instance of a model that can be located by
@@ -65,7 +67,11 @@ module Decidim
       #
       # Returns an HTML-safe String.
       def present_resource_name
-        h.translated_attribute extra["title"]
+        if resource.present? && resource.respond_to?(:presenter) && resource.presenter.respond_to?(:title)
+          resource.presenter.title(html_escape: true)
+        else
+          decidim_escape_translated(extra["title"]).html_safe
+        end
       end
     end
   end

data/app/services/decidim/log/diff_changeset_calculator.rb

@@ -86,7 +86,7 @@ module Decidim
         locales.flat_map do |locale|
           previous_value = values.first.try(:[], locale)
           new_value = values.last.try(:[], locale)
-          if previous_value == new_value
+          if previous_value == new_value || (previous_value.nil? && new_value.blank?)
             nil
           else
             label = generate_label(attribute, locale)

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

@@ -1,3 +1,5 @@
+<% add_decidim_page_title t("decidim.links.warning.title") %>
+
 <div class="wrapper external-link-page-content">
   <h1 class="text-center"><%= t("decidim.links.warning.title") %></h1>
   <div class="row columns large-centered large-8">

data/config/locales/ar.yml

@@ -333,7 +333,6 @@ ar:
           '1': إنشاء التعديل الخاص بك
           '2': قارن تعديلك
           '3': اكمل تعديلك
-          '4': انشر تعديلك
     anonymous_user: مجهول
     application:
       collection: