decidim-core 0.27.3 → 0.27.4

data/app/queries/decidim/public_activities.rb

@@ -22,7 +22,7 @@ module Decidim
   #   contained in any of them as spaces.
   # :scopes - a collection of `Decidim::Scope`. It will return any activity that
   #   took place in any of those scopes.
-  class PublicActivities < Decidim::Query
+  class PublicActivities < LastActivity
     def initialize(organization, options = {})
       @organization = organization
       @resource_name = options[:resource_name]
@@ -33,26 +33,19 @@ module Decidim
     end
 
     def query
-      query = ActionLog
-              .where(visibility: visibility)
-              .where(organization: organization)
+      query = base_query
 
       query = query.where(user: user) if user
       query = query.where(resource_type: resource_name) if resource_name.present?
 
       query = filter_follows(query)
-      query = filter_hidden(query)
-
-      query.order(created_at: :desc)
+      query = filter_moderated(query)
+      filter_spaces(query)
     end
 
     private
 
-    attr_reader :organization, :resource_name, :user, :current_user, :follows, :scopes
-
-    def visibility
-      %w(public-only all)
-    end
+    attr_reader :resource_name, :user, :follows, :scopes
 
     def filter_follows(query)
       conditions = []
@@ -79,51 +72,6 @@ module Decidim
       query.where(chained_conditions)
     end
 
-    def filter_hidden(query)
-      # Filter out the items that have been moderated.
-      query = query.joins(
-        <<~SQL.squish
-          LEFT JOIN decidim_moderations
-            ON decidim_moderations.decidim_reportable_type = decidim_action_logs.resource_type
-            AND decidim_moderations.decidim_reportable_id = decidim_action_logs.resource_id
-            AND decidim_moderations.hidden_at IS NOT NULL
-        SQL
-      ).where(decidim_moderations: { id: nil })
-
-      # Filter out the private space items that should not be visible for the
-      # current user.
-      current_user_id = current_user&.id.to_i
-      Decidim.participatory_space_manifests.map do |manifest|
-        klass = manifest.model_class_name.constantize
-        next unless klass.include?(Decidim::HasPrivateUsers)
-
-        table = klass.table_name
-        query = query.joins(
-          Arel.sql(
-            <<~SQL.squish
-              LEFT JOIN #{table}
-                ON decidim_action_logs.participatory_space_type = '#{manifest.model_class_name}'
-                AND #{table}.id = decidim_action_logs.participatory_space_id
-              LEFT JOIN decidim_participatory_space_private_users AS #{manifest.name}_private_users
-                ON #{manifest.name}_private_users.privatable_to_type = '#{manifest.model_class_name}'
-                AND #{table}.id = #{manifest.name}_private_users.privatable_to_id
-                AND #{table}.private_space = 't'
-            SQL
-          ).to_s
-        ).where(
-          Arel.sql(
-            <<~SQL.squish
-              #{table}.id IS NULL OR
-              #{table}.private_space = 'f' OR
-              #{manifest.name}_private_users.decidim_user_id = #{current_user_id}
-            SQL
-          ).to_s
-        )
-      end
-
-      query
-    end
-
     def followed_users_conditions(follows)
       followed_users = follows.where(decidim_followable_type: "Decidim::UserBaseEntity")
       return [] if followed_users.empty?

data/app/services/decidim/email_notification_generator.rb

@@ -63,7 +63,7 @@ module Decidim
     # Returns nothing.
     def send_email_to(recipient, user_role:)
       return unless recipient
-      return unless recipient.notifications_sending_frequency == "real_time"
+      return unless should_send_email?(recipient)
       return if resource.respond_to?(:can_participate?) && !resource.can_participate?(recipient)
 
       wait_time = 0
@@ -81,6 +81,12 @@ module Decidim
         .deliver_later(wait: wait_time)
     end
 
+    def should_send_email?(recipient)
+      return extra[:force_email] if extra.has_key?(:force_email)
+
+      recipient.notifications_sending_frequency == "real_time"
+    end
+
     def component
       return resource.component if resource.is_a?(Decidim::HasComponent)
 

data/app/services/decidim/send_push_notification.rb

@@ -16,7 +16,7 @@ module Decidim
     #
     # Returns the result of the dispatch or nil if user or subscription are empty
     def perform(notification)
-      return unless Rails.application.secrets.vapid[:enabled]
+      return unless Rails.application.secrets.dig(:vapid, :enabled)
 
       I18n.with_locale(notification.user.locale || notification.user.organization.default_locale) do
         notification.user.notifications_subscriptions.values.map do |subscription|

data/app/uploaders/decidim/application_uploader.rb

@@ -30,6 +30,8 @@ module Decidim
       else
         model.send(mounted_as)
       end
+    rescue ActiveStorage::InvariableError
+      model.send(mounted_as)
     end
 
     def attached?

data/app/views/decidim/devise/registrations/new.html.erb.orig

@@ -0,0 +1,231 @@
+<% add_decidim_page_title(t(".sign_up")) %>
+
+<% content_for :devise_links do %>
+  <%= render "decidim/devise/shared/links" %>
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_center" do %>
+  <div class="flex justify-center">
+    <h1 class="h3 md:h1 decorator my-12"><%= t("decidim.devise.registrations.new.sign_up") %></h1>
+  </div>
+
+  <div class="login__info">
+    <p>
+      <%= t("decidim.devise.registrations.new.subtitle") %>
+    </p>
+    <p class="font-semibold">
+      <%= t("decidim.devise.registrations.new.already_have_an_account?") %>
+      <%= link_to t("decidim.devise.registrations.new.sign_in"), new_user_session_path %>
+    </p>
+  </div>
+
+  <div class="login__info-required">
+    <%= form_required_explanation %>
+  </div>
+
+  <div class="login__omniauth-container">
+    <% cache current_organization do %>
+      <%= render "decidim/devise/shared/omniauth_buttons" %>
+    <% end %>
+  </div>
+
+  <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: registration_path(resource_name), html: { id: "register-form" }) do |f| %>
+    <%= invisible_captcha %>
+
+    <div class="form__wrapper">
+      <%= f.text_field :name, help_text: t("decidim.devise.registrations.new.username_help"), autocomplete: "name", placeholder: "John Doe" %>
+
+      <%= f.text_field :nickname, help_text: t("decidim.devise.registrations.new.nickname_help", organization: current_organization.name), autocomplete: "nickname", placeholder: "johndoe" %>
+
+      <%= f.email_field :email, autocomplete: "email", placeholder: "hi@email.com" %>
+
+      <%= f.password_field :password, password_field_options_for(:user) %>
+
+      <%= f.password_field :password_confirmation, password_field_options_for(:user).except(:help_text) %>
+    </div>
+
+    <div id="card__tos" class="form__wrapper-block">
+      <h4 class="h4"><%= t("decidim.devise.registrations.new.tos_title") %></h4>
+
+      <div class="tos-text">
+        <% terms_of_service_summary_content_blocks.each do |content_block| %>
+          <%= cell content_block.manifest.cell, content_block %>
+        <% end %>
+      </div>
+
+      <%= f.check_box :tos_agreement, label: t("decidim.devise.registrations.new.tos_agreement", link: link_to(t("decidim.devise.registrations.new.terms"), page_path("terms-of-service"))), label_options: { class: "form__wrapper-checkbox-label" } %>
+    </div>
+
+    <div id="card__newsletter" class="form__wrapper-block">
+      <h4 class="h4"><%= t("decidim.devise.registrations.new.newsletter_title") %></h4>
+      <%= f.check_box :newsletter, label: t("decidim.devise.registrations.new.newsletter"), checked: @form.newsletter, label_options: { class: "form__wrapper-checkbox-label" } %>
+    </div>
+
+    <div class="form__wrapper-block">
+      <button type="submit" class="button button__lg button__secondary">
+        <%= t("decidim.devise.registrations.new.sign_up") %>
+        <%= icon "arrow-right-line", class: "fill-current" %>
+      </button>
+    </div>
+
+    <div class="login__links">
+      <%= render "decidim/devise/shared/redesigned_links" %>
+    </div>
+  <% end %>
+<% end %>
+
+<<<<<<< HEAD
+||||||| parent of 4e14afa36c (add password toggle via unobstructive javascript)
+  <div class="row">
+    <div class="columns large-6 medium-10 medium-centered">
+
+      <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: registration_path(resource_name), html: { class: "register-form new_user", id: "register-form" }) do |f| %>
+        <%= invisible_captcha %>
+        <div class="card">
+          <div class="card__content">
+            <%= form_required_explanation %>
+
+            <div class="user-person">
+              <div class="field">
+                <%= f.text_field :name, help_text: t(".username_help"), autocomplete: "name" %>
+              </div>
+            </div>
+
+            <div class="user-nickname">
+              <div class="field">
+                <%= f.text_field :nickname, help_text: t(".nickname_help", organization: current_organization.name), prefix: { value: "@", small: 1, large: 1 }, autocomplete: "nickname" %>
+              </div>
+            </div>
+
+            <div class="field">
+              <%= f.email_field :email, autocomplete: "email" %>
+            </div>
+
+            <div class="field">
+              <%= f.password_field :password, password_field_options_for(:user) %>
+            </div>
+
+            <div class="field">
+              <%= f.password_field :password_confirmation, password_field_options_for(:user).except(:help_text) %>
+            </div>
+          </div>
+        </div>
+
+        <div class="card" id="card__tos">
+          <div class="card__content">
+            <h3><%= t(".tos_title") %></h3>
+
+            <p class="tos-text">
+              <%= strip_tags(translated_attribute(terms_and_conditions_page.content)) %>
+            </p>
+
+            <div class="field">
+              <%= f.check_box :tos_agreement, label: t(".tos_agreement", link: link_to(t(".terms"), page_path("terms-and-conditions"))) %>
+            </div>
+          </div>
+        </div>
+
+        <div class="card" id="card__newsletter">
+          <div class="card__content">
+            <h3><%= t(".newsletter_title") %></h3>
+              <div class="field">
+                <%= f.check_box :newsletter, label: t(".newsletter"), checked: @form.newsletter %>
+              </div>
+          </div>
+        </div>
+
+        <div class="card">
+          <div class="card__content">
+            <div class="actions">
+              <%= f.submit t("devise.registrations.new.sign_up"), class: "button expanded" %>
+            </div>
+            <%= yield :devise_links %>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>
+</div>
+=======
+  <div class="row">
+    <div class="columns large-6 medium-10 medium-centered">
+
+      <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: registration_path(resource_name), html: { class: "register-form new_user", id: "register-form" }) do |f| %>
+        <%= invisible_captcha %>
+        <div class="card">
+          <div class="card__content">
+            <%= form_required_explanation %>
+
+            <div class="user-person">
+              <div class="field">
+                <%= f.text_field :name, help_text: t(".username_help"), autocomplete: "off" %>
+              </div>
+            </div>
+
+            <div class="user-nickname">
+              <div class="field">
+                <%= f.text_field :nickname, help_text: t(".nickname_help", organization: current_organization.name), prefix: { value: "@", small: 1, large: 1 }, autocomplete: "off" %>
+              </div>
+            </div>
+
+            <div class="field">
+              <%= f.email_field :email, autocomplete: "email" %>
+            </div>
+
+            <div class="user-password">
+              <div class="field">
+                <%= f.password_field :password, password_field_options_for(:user) %>
+              </div>
+            </div>
+
+            <div class="user-password-confirmation">
+              <div class="field">
+                <%= f.password_field :password_confirmation, password_field_options_for(:user).except(:help_text) %>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="card" id="card__tos">
+          <div class="card__content">
+            <h3><%= t(".tos_title") %></h3>
+
+            <p class="tos-text">
+              <%= strip_tags(translated_attribute(terms_and_conditions_page.content)) %>
+            </p>
+
+            <div class="field">
+              <%= f.check_box :tos_agreement, label: t(".tos_agreement", link: link_to(t(".terms"), page_path("terms-and-conditions"))) %>
+            </div>
+          </div>
+        </div>
+
+        <div class="card" id="card__newsletter">
+          <div class="card__content">
+            <h3><%= t(".newsletter_title") %></h3>
+              <div class="field">
+                <%= f.check_box :newsletter, label: t(".newsletter"), checked: @form.newsletter %>
+              </div>
+          </div>
+        </div>
+
+        <div class="card">
+          <div class="card__content">
+            <div class="actions">
+              <%= f.submit t("devise.registrations.new.sign_up"), class: "button expanded" %>
+            </div>
+            <%= yield :devise_links %>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>
+</div>
+>>>>>>> 4e14afa36c (add password toggle via unobstructive javascript)
+<%= render "decidim/devise/shared/newsletter_modal" %>
+
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_registrations" %>
+<% end %>

data/config/locales/ar.yml

@@ -1482,7 +1482,7 @@ ar:
       index:
         add_max_users: 'يمكن إضافة مستخدمين إلى المحادثة: 9 مستخدمين كحد أقصى'
         add_users_placeholder: البحث…
-        close: غلق
+        close: قريب
         conversations_info: المحادثات خاصة. لا يمكن لأحد آخر أن يراها. يمكن بدء محادثة مع أي مشارك أو مجموعة مسجلة على المنصة.
         from: من
         last_message: آخر رسالة
@@ -1503,7 +1503,7 @@ ar:
         back: عرض كافة المحادثات
         deleted_accounts: لا يمكن أن يكون لديك محادثة مع حسابات محذوفة.
         not_allowed: هذا المستخدم لم يعد يستقبل المزيد من الرسائل المباشرة.
-        title: محادثة مع %{usernames}
+        title: المحادثة مع %{usernames}
       update:
         error: لم يتم إرسال الرسالة. حاول مرة أخرى في وقت لاحق
     user_interests:
@@ -1749,7 +1749,7 @@ ar:
             description: وصف
             name: اسم
             service: الخدمة
-            type: النوع
+            type: نوع
           items:
             _session_id:
               description: يسمح للمواقع بتذكر المستخدم داخل الموقع عندما ينتقل بين صفحات الويب.

data/config/locales/bg.yml

@@ -1327,6 +1327,10 @@ bg:
     timestamp_error_message: Извинете, това беше твърде бързо! Моля, изпратете отново.
   layouts:
     decidim:
+      data_consent:
+        details:
+          columns:
+            type: Тип
       edit_link:
         edit: Редактирай
       footer:

data/config/locales/ca.yml

@@ -421,7 +421,7 @@ ca:
           request_confirmation_instructions: Sol·licita instruccions de confirmació
           title: Confirma el teu correu electrònic
       show:
-        close_modal: Tanca modal
+        close_modal: Tancar el modal
     block_user_mailer:
       notify:
         body_1: El teu compte ha estat bloquejat.
@@ -557,7 +557,7 @@ ca:
         newsletter_modal:
           buttons:
             check: Marca i continua
-            close_modal: Tanca modal
+            close_modal: Tancar el modal
             uncheck: Deixa desmarcada
           notice: |-
             <p>Hola, segur que no vols rebre un butlletí?<br>
@@ -975,7 +975,7 @@ ca:
         body_1: Estàs a punt de visitar un enllaç extern i et recomanem que siguis prudent pel que fa als continguts en pàgines externes.
         body_2: Assegura't que l'enllaç que visitaràs és d'un lloc segur abans de seguir.
         cancel: Cancel·lar
-        close_modal: Tanca modal
+        close_modal: Tancar el modal
         proceed: Continuar
         title: Obrir enllaç extern
     log:
@@ -1068,7 +1068,7 @@ ca:
           ok: D'acord
         index:
           ago: fa
-          close: Tanca modal
+          close: Tancar el modal
           from: De
           groups: Els meus grups
           last_message: Darrer missatge
@@ -1260,7 +1260,7 @@ ca:
           modal_btn_continue: Acceptar els termes i condicions d'ús, i continuar
           modal_btn_exit: Ho revisaré més tard
           modal_button: Rebutjar els termes i condicions d'ús
-          modal_close: Tanca modal
+          modal_close: Tancar el modal
           modal_title: Confirmes que no acceptes els Termes i Condicions actualitzats?
         required_review:
           alert: Hem actualitzat els nostres Termes de Servei, si us plau revisa'ls.
@@ -1379,7 +1379,7 @@ ca:
         ok: D'acord
         title: Confirmar
       embed_modal:
-        close_window: Tanca la finestra
+        close_window: Tancar finestra
         embed: Si us plau, enganxa aquest codi a la teva pàgina
         embed_link: Incrusta
       extended_navigation_bar:
@@ -1703,6 +1703,7 @@ ca:
       too_many_marks: Estàs fent servir massa signes de puntuació consecutius (p. ex. i?)
       too_much_caps: Estàs utilitzant massa lletres majúscules (més del 25% del text)
       too_short: és massa curt (menys %{count} caràcters)
+      url_format: El format d'aquesta URL és incorrecte
   forms:
     correct_errors: Hi ha errors al formulari, si us plau corregeix-los per continuar.
     length_validator:

data/config/locales/cs.yml

@@ -127,6 +127,21 @@ cs:
         few: "%{count} hodiny"
         many: "%{count} hodin"
         other: "%{count} hodin"
+      x_minutes:
+        one: 1 minuta
+        few: "%{count} minuty"
+        many: "%{count} minut"
+        other: "%{count} minut"
+      x_months:
+        one: 1 měsíc
+        few: "%{count} měsíce"
+        many: "%{count} měsíců"
+        other: "%{count} měsíců"
+      x_seconds:
+        one: 1 sekunda
+        few: "%{count} sekundy"
+        many: "%{count} sekund"
+        other: "%{count} sekund"
   decidim:
     accessibility:
       external_link: Externí odkaz
@@ -441,7 +456,7 @@ cs:
           request_confirmation_instructions: Požádejte o pokyny pro potvrzení
           title: Potvrdit svůj email
       show:
-        close_modal: Zavřít okno
+        close_modal: Zavřít modální
     block_user_mailer:
       notify:
         body_1: Váš účet byl zablokován.
@@ -579,7 +594,7 @@ cs:
         newsletter_modal:
           buttons:
             check: Zkontrolujte a pokračujte
-            close_modal: Zavřít okno
+            close_modal: Zavřít modální
             uncheck: Ponechat nezaškrtnuté
           notice: |-
             <p>Hej, jste si jisti, že nechcete dostávat zpravodaj?<br>
@@ -1003,7 +1018,7 @@ cs:
         body_1: Chystáte se navštívit externí odkaz a chtěli bychom, abyste byli opatrní, pokud jde o obsah na externím webu.
         body_2: Zkontrolujte prosím odkaz, který se chystáte navštívit, a než budete pokračovat, ujistěte se, že jste jej rozpoznali jako bezpečný web.
         cancel: Zrušit
-        close_modal: Zavřít okno
+        close_modal: Zavřít modální
         proceed: Pokračovat
         title: Otevřít externí odkaz
     log:
@@ -1096,7 +1111,7 @@ cs:
           ok: OK
         index:
           ago: před
-          close: Zavřít okno
+          close: Zavřít modální
           from: Od
           groups: Moje skupiny
           last_message: Poslední zpráva
@@ -1288,7 +1303,7 @@ cs:
           modal_btn_continue: Přijmout podmínky a pokračovat
           modal_btn_exit: Později to přezkoumám
           modal_button: Odmítnout podmínky
-          modal_close: Zavřít okno
+          modal_close: Zavřít modální
           modal_title: Opravdu odmítáte aktualizované smluvní podmínky?
         required_review:
           alert: Aktualizovali jsme Smluvní podmínky, přečtěte si je.
@@ -1519,7 +1534,7 @@ cs:
         back: Zobrazit všechny konverzace
         deleted_accounts: Nemůžete mít konverzaci s odstraněnými účty.
         not_allowed: Tento uživatel již nepřijímá žádné přímé zprávy.
-        title: Konverzace s %{usernames}
+        title: Konverzace s číslem %{usernames}
       update:
         error: Zpráva nebyla odeslána. Zkuste to později
     user_interests:
@@ -1559,7 +1574,7 @@ cs:
         version: Verze %{number}
     versions_list:
       show:
-        back_to_resource: Vrátit se zpět
+        back_to_resource: Jít zpět
         changes_at_title: Změny v "%{title}"
         number_of_versions: Verze
         title: Verze
@@ -1738,6 +1753,7 @@ cs:
       too_many_marks: používá příliš mnoho po sobě jdoucích interpunkčních znamének (např.! a?)
       too_much_caps: používá příliš mnoho velkých písmen (více než 25% textu)
       too_short: je příliš krátká (pod %{count} znaků)
+      url_format: Tato adresa URL je v nesprávném formátu
   forms:
     correct_errors: Na formuláři jsou chyby, opravte je a pokračujte.
     length_validator: