decidim-core 0.27.3 → 0.27.4

data/config/locales/sk.yml

@@ -311,7 +311,7 @@ sk:
           request_confirmation_instructions: Požiadajte o pokyny pre potvrdenie
           title: Potvrdiť svoj email
       show:
-        close_modal: Zatvoriť okno
+        close_modal: Zatvoriť modálne
     collapsible_list:
       hidden_elements_count:
         one: a %{count} ďalších
@@ -422,7 +422,7 @@ sk:
         newsletter_modal:
           buttons:
             check: Skontrolujte a pokračujte
-            close_modal: Zatvoriť okno
+            close_modal: Zatvoriť modálne
           notice: |-
             | - <P> Hej, ste si istí, že nechcete dostávať newsletter? <br> Označte zaškrtávacie políčko nižšie. <br> Pre nás je veľmi dôležité, aby ste obdržali príležitostné e-maily aby ste dostali dôležitá oznámenia, môžete to vždy zmeniť v nastavenia oznámenia. </ p> <P> Ak nezaškrtnete zaškrtávacie políčko, môže vám chýbať relevantné informácie o nových možnostiach účasti v rámci platformy. <br> Ak sa chcete aj naďalej vyhýbať prijímanie informačných spravodajcov, dokonale rozumieme vášmu rozhodnutiu. </ p> <P> Ďakujeme, že ste si to prečítali! </ P>
           title: Upozornenie na bulletin
@@ -753,7 +753,7 @@ sk:
         resource_type: Typ
     links:
       warning:
-        close_modal: Zatvoriť okno
+        close_modal: Zatvoriť modálne
     log:
       base_presenter:
         create: "%{user_name} vytvořeno %{resource_name}"
@@ -802,7 +802,7 @@ sk:
         create:
           error: Konverzace se nespustí. Zkuste to později znovu
         index:
-          close: Zatvoriť okno
+          close: Zatvoriť modálne
           new_conversation: Nová konverzácia
           next: Nasledujúce
           no_conversations: Nemáte zatím žádné konverzace
@@ -916,7 +916,7 @@ sk:
           participate: zúčastniť sa
           welcome: Vitajte na%{organization}!
         metrics:
-          headline: Metrika
+          headline: Metriky
         statistics:
           headline: Aktuálny stav %{organization}
         sub_hero:
@@ -939,7 +939,7 @@ sk:
           legend: Souhlasíte s podmínkami používání
         refuse:
           modal_btn_exit: Neskôr to preskúmam
-          modal_close: Zatvoriť okno
+          modal_close: Zatvoriť modálne
           modal_title: Naozaj odmietate aktualizované zmluvné podmienky?
         required_review:
           alert: Aktualizovali sme Zmluvné podmienky, prečítajte si ich.
@@ -1028,7 +1028,7 @@ sk:
         view_all: Zobrazit všechny (%{count})
     shared:
       embed_modal:
-        close_window: Zátvor okno
+        close_window: Zavrieť okno
         embed: Vložte tento kód na svoju stránku
         embed_link: Vložiť
       extended_navigation_bar:
@@ -1070,6 +1070,16 @@ sk:
       comments_count: Komentáre
     user_contact_disabled: Tento účastník nepovoľuje posielanie priamych správ.
     user_conversations:
+      index:
+        add_max_users: 'Pridajte účastníkov do konverzácie: nanajvýš 9 účastníkov'
+        add_users_placeholder: Hľadať...
+        close: Zavrieť
+        modal_title: Nová konverzácia
+        new_conversation: Nová konverzácia
+        next: Nasledujúce
+        no_results: Žiadne výsledky
+      show:
+        title: Konverzace s číslem %{usernames}
       update:
         error: Zpráva nebyla odeslána. Zkuste to později znovu
     user_interests:
@@ -1256,6 +1266,10 @@ sk:
     timestamp_error_message: Prepáčte, bolo to príliš rýchle! Znovu odošlite.
   layouts:
     decidim:
+      data_consent:
+        details:
+          columns:
+            type: Typ
       edit_link:
         edit: Upraviť
       footer:

data/config/locales/sr-CS.yml

@@ -91,6 +91,14 @@ sr:
       results_per_page:
         title: Izaberite broj rezultata po stranici
     user_contact_disabled: Ovaj učesnik ne prihvata direktne poruke.
+    user_conversations:
+      index:
+        add_max_users: 'Dodajte korisnike u razgovor: najviše 9 korisnika'
+        add_users_placeholder: Pretraži...
+        modal_title: Novi razgovor
+        new_conversation: Novi razgovor
+        next: Slеdеćе
+        no_results: Nema rezultata
   errors:
     messages:
       invalid_time_zone: nije validna vremenska zona

data/config/locales/sv.yml

@@ -364,7 +364,7 @@ sv:
           request_confirmation_instructions: Begär bekräftelseanvisningar
           title: Bekräfta din e-postadress
       show:
-        close_modal: Stäng modal
+        close_modal: Stäng fönster
     block_user_mailer:
       notify:
         body_1: Ditt konto har spärrats.
@@ -500,7 +500,7 @@ sv:
         newsletter_modal:
           buttons:
             check: Kontrollera och fortsätt
-            close_modal: Stäng modal
+            close_modal: Stäng fönster
             uncheck: Behåll avmarkeringen
           notice: |-
             <p>Hej, är du säker på att du inte vill få nyhetsbrevet?<br>
@@ -902,7 +902,7 @@ sv:
         body_1: Du är på väg att besöka en extern länk och vi vill att du ska vara försiktig med innehållet på den externa webbplatsen.
         body_2: Kontrollera länken du är på väg att besöka och se till att den är säker innan du fortsätter.
         cancel: Avbryt
-        close_modal: Stäng modal
+        close_modal: Stäng fönster
         proceed: Fortsätt
         title: Öppna extern länk
     log:
@@ -992,7 +992,7 @@ sv:
           ok: OK
         index:
           ago: sedan
-          close: Stäng modal
+          close: Stäng fönster
           from: Från
           groups: Mina grupper
           last_message: Senaste meddelande
@@ -1138,7 +1138,7 @@ sv:
           participate: Delta
           welcome: Välkommen till %{organization}!
         metrics:
-          headline: Deltagande i siffror
+          headline: Metrik
         statistics:
           headline: Aktuellt läge för %{organization}
         sub_hero:
@@ -1161,7 +1161,7 @@ sv:
           legend: Godkänn användarvillkoren
         refuse:
           modal_btn_exit: Jag granskar dem senare
-          modal_close: Stäng modal
+          modal_close: Stäng fönster
           modal_title: Avvisar du de uppdaterade användarvillkoren?
         required_review:
           alert: Vi har uppdaterat våra användarvillkor, var god och granska dem.
@@ -1275,7 +1275,7 @@ sv:
         ok: Ok
         title: Bekräfta
       embed_modal:
-        close_window: Stäng fönstret
+        close_window: Stäng fönster
         embed: Klistra in den här koden på din sida
         embed_link: Bädda in
       extended_navigation_bar:
@@ -1357,14 +1357,14 @@ sv:
         existing_error: Meddelandet kunde inte skapas. Konversationen finns redan, försök igen nu.
         success: Samtalet startades framgångsrikt!
       index:
-        add_max_users: 'Lägg till användare till konversation: max 9 användare'
+        add_max_users: 'Lägg till användare i samtalet: högst 9'
         add_users_placeholder: Sök...
         close: Stäng
         conversations_info: Konversationer är privata. Ingen annan kan se dem. En konversation kan startas med någon deltagare eller grupp som är registrerad på plattformen.
         from: Från
         last_message: Senaste meddelande
-        modal_title: Ny konversation
-        new_conversation: Ny konversation
+        modal_title: Nytt samtal
+        new_conversation: Nytt samtal
         next: Nästa
         no_conversations_warning: Det finns inga konversationer än.
         no_results: Inga resultat
@@ -1380,7 +1380,7 @@ sv:
         back: Visa alla samtal
         deleted_accounts: Du kan inte meddela raderade konton.
         not_allowed: Den här användaren accepterar inte fler direkta meddelanden.
-        title: Konversation med %{usernames}
+        title: Samtal med %{usernames}
       update:
         error: Meddelandet skickades inte. Försök igen senare
     user_interests:

data/config/locales/tr-TR.yml

@@ -1482,6 +1482,10 @@ tr:
     timestamp_error_message: Üzgünüm, bu çok hızlıydı! Lütfen yeniden gönderin.
   layouts:
     decidim:
+      data_consent:
+        details:
+          columns:
+            type: Türü
       edit_link:
         edit: Düzenle
       footer:

data/config/locales/uk.yml

@@ -536,6 +536,8 @@ uk:
     statistics:
       comments_count: Коментарів
     user_conversations:
+      index:
+        close: Закрити
       update:
         error: Повідомлення не надіслано. Спробуйте ще раз пізніше
     version_author:

data/config/locales/zh-CN.yml

@@ -1385,6 +1385,10 @@ zh-CN:
     timestamp_error_message: 对不起，这太快了！请重新提交。
   layouts:
     decidim:
+      data_consent:
+        details:
+          columns:
+            type: 类型
       edit_link:
         edit: 编辑
       footer:

data/config/locales/zh-TW.yml

@@ -89,6 +89,20 @@ zh-TW:
       about_x_months:
         other: "one\n大約 1 月\n\nOther\n大約 %{count} 月"
       half_a_minute: 半分鐘
+      less_than_x_minutes:
+        other: 少於 %{count} 分鐘
+      less_than_x_seconds:
+        other: "< 1秒\n< %{count} 秒"
+      x_days:
+        other: "1天\n%{count} 天"
+      x_hours:
+        other: "{count} 小時"
+      x_minutes:
+        other: "%{count} 分鐘"
+      x_months:
+        other: "%{count} 個月"
+      x_seconds:
+        other: "%{count} 秒"
   decidim:
     accessibility:
       external_link: 外部鏈接
@@ -1439,8 +1453,8 @@ zh-TW:
         conversations_info: 對話是私密的，沒有其他人可以看到。可以與平台上註冊的任何參與者或群組開始對話。
         from: 來自
         last_message: 最後訊息
-        modal_title: 新對話
-        new_conversation: 新對話
+        modal_title: 新的對話
+        new_conversation: 新的對話
         next: 下一個
         no_conversations_warning: 目前還沒有任何對話。
         no_results: 無結果
@@ -1686,7 +1700,7 @@ zh-TW:
             description: 說明
             name: 名稱
             service: 服務
-            type: 種類
+            type: 類別
           items:
             _session_id:
               description: 允許網站在使用者在網頁之間移動時記住使用者。

data/db/migrate/20181030090144_destroy_deleted_users_follows.rb

@@ -10,7 +10,7 @@ class DestroyDeletedUsersFollows < ActiveRecord::Migration[5.2]
   end
 
   def change
-    deleted_users = Decidim::User.where.not(deleted_at: nil).pluck(:id)
+    deleted_users = User.where.not(deleted_at: nil).pluck(:id)
     Follow.where(decidim_followable_type: "Decidim::UserBaseEntity", decidim_followable_id: deleted_users).destroy_all
     Follow.where(decidim_user_id: deleted_users).destroy_all
   end

data/db/migrate/20181204110723_remove_following_users_count_from_users.rb

@@ -1,6 +1,15 @@
 # frozen_string_literal: true
 
 class RemoveFollowingUsersCountFromUsers < ActiveRecord::Migration[5.2]
+  class UserBaseEntity < ApplicationRecord
+    self.table_name = :decidim_users
+    self.inheritance_column = nil # disable the default inheritance
+  end
+
+  class Follow < ApplicationRecord
+    self.table_name = :decidim_follows
+  end
+
   def up
     remove_column :decidim_users, :following_users_count
   end
@@ -8,8 +17,8 @@ class RemoveFollowingUsersCountFromUsers < ActiveRecord::Migration[5.2]
   def down
     add_column :decidim_users, :following_users_count, :integer, null: false, default: 0
 
-    Decidim::UserBaseEntity.find_each do |entity|
-      following_users_count = Decidim::Follow.where(decidim_user_id: entity.id, decidim_followable_type: ["Decidim::UserBaseEntity", "Decidim::User", "Decidim::UserGroup"]).count
+    UserBaseEntity.find_each do |entity|
+      following_users_count = Follow.where(decidim_user_id: entity.id, decidim_followable_type: ["Decidim::UserBaseEntity", "Decidim::User", "Decidim::UserGroup"]).count
       entity.following_users_count = following_users_count
       entity.save
     end

data/db/migrate/20181214101250_add_notification_types_to_users.rb

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
 class AddNotificationTypesToUsers < ActiveRecord::Migration[5.2]
+  class UserBaseEntity < ApplicationRecord
+    self.table_name = :decidim_users
+    self.inheritance_column = nil # disable the default inheritance
+  end
+
   def change
     add_column :decidim_users, :notification_types, :string, default: "all"
     # rubocop:disable Rails/SkipsModelValidations
-    Decidim::UserBaseEntity.update_all(notification_types: "all")
+    UserBaseEntity.update_all(notification_types: "all")
     # rubocop:enable Rails/SkipsModelValidations
 
     change_column_null :decidim_users, :notification_types, false

data/db/migrate/20190412131728_fix_user_names.rb

@@ -1,6 +1,13 @@
 # frozen_string_literal: true
 
 class FixUserNames < ActiveRecord::Migration[5.2]
+  class UserBaseEntity < ApplicationRecord
+    include Decidim::Nicknamizable
+
+    self.table_name = :decidim_users
+    self.inheritance_column = nil # disable the default inheritance
+  end
+
   def change
     # Comes from Decidim::User specs
     weird_characters =
@@ -8,7 +15,7 @@ class FixUserNames < ActiveRecord::Migration[5.2]
     characters_to_remove = "<>?%&^*\#@()[]=+:;\"{}\\|/"
 
     weird_characters.each do |character|
-      Decidim::UserBaseEntity.where(deleted_at: nil).where("name like '%#{character}%' escape '\' OR nickname like '%#{character}%' escape '\'").find_each do |entity|
+      UserBaseEntity.where(deleted_at: nil).where("name like '%#{character}%' escape '\' OR nickname like '%#{character}%' escape '\'").find_each do |entity|
         Rails.logger.debug { "detected character: #{character}" }
         Rails.logger.debug { "UserBaseEntity ID: #{entity.id}" }
         Rails.logger.debug { "#{entity.name} => #{entity.name.delete(characters_to_remove).strip}" }
@@ -16,7 +23,7 @@ class FixUserNames < ActiveRecord::Migration[5.2]
 
         entity.name = entity.name.delete(characters_to_remove).strip
         sanitized_nickname = entity.nickname.delete(characters_to_remove).strip
-        entity.nickname = Decidim::UserBaseEntity.nicknamize(sanitized_nickname, organization: entity.organization)
+        entity.nickname = UserBaseEntity.nicknamize(sanitized_nickname, organization: entity.organization)
         entity.save(validate: false)
       end
     end

data/db/migrate/20200211173227_add_direct_message_types_to_users.rb

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
 class AddDirectMessageTypesToUsers < ActiveRecord::Migration[5.2]
+  class UserBaseEntity < ApplicationRecord
+    self.table_name = :decidim_users
+    self.inheritance_column = nil # disable the default inheritance
+  end
+
   def change
     add_column :decidim_users, :direct_message_types, :string, default: "all"
     # rubocop:disable Rails/SkipsModelValidations
-    Decidim::UserBaseEntity.update_all(direct_message_types: "all")
+    UserBaseEntity.update_all(direct_message_types: "all")
     # rubocop:enable Rails/SkipsModelValidations
 
     change_column_null :decidim_users, :direct_message_types, false

data/db/migrate/20210302150803_invalidate_all_sessions_for_deleted_users.rb

@@ -1,10 +1,17 @@
 # frozen_string_literal: true
 
 class InvalidateAllSessionsForDeletedUsers < ActiveRecord::Migration[5.2]
-  def up
-    Decidim::User.reset_column_information
+  class User < ApplicationRecord
+    self.table_name = "decidim_users"
+    self.inheritance_column = nil # disable the default inheritance
+
+    default_scope { where(type: "Decidim::User") }
+  end
 
-    Decidim::User.where.not(deleted_at: nil).find_each(&:invalidate_all_sessions!)
+  def up
+    User.where.not(deleted_at: nil).find_each do |user|
+      user.update!(session_token: SecureRandom.hex)
+    end
   end
 
   def down; end

data/db/migrate/20210310120640_add_followable_counter_cache_to_users.rb

@@ -1,14 +1,24 @@
 # frozen_string_literal: true
 
 class AddFollowableCounterCacheToUsers < ActiveRecord::Migration[5.2]
+  class Follow < ApplicationRecord
+    self.table_name = "decidim_follows"
+  end
+
+  class User < ApplicationRecord
+    self.table_name = "decidim_users"
+    self.inheritance_column = nil # disable the default inheritance
+
+    default_scope { where(type: "Decidim::User") }
+  end
+
   def change
     add_column :decidim_users, :follows_count, :integer, null: false, default: 0, index: true
 
     reversible do |dir|
       dir.up do
-        Decidim::User.reset_column_information
-        Decidim::User.find_each do |record|
-          record.class.reset_counters(record.id, :follows)
+        User.find_each do |record|
+          record.update!(follows_count: Follow.where(decidim_user_id: record.id).count)
         end
       end
     end

data/db/seeds.rb

@@ -125,7 +125,8 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
     tos_agreement: true,
     personal_url: Faker::Internet.url,
     about: Faker::Lorem.paragraph(sentence_count: 2),
-    accepted_tos_version: organization.tos_version,
+    accepted_tos_version: organization.tos_version + 1.hour,
+    password_updated_at: Time.current,
     admin_terms_accepted_at: Time.current
   }
   admin_hash.merge!(password: "decidim123456789", password_confirmation: "decidim123456789") if admin.encrypted_password.blank?
@@ -143,7 +144,7 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
       tos_agreement: true,
       personal_url: Faker::Internet.url,
       about: Faker::Lorem.paragraph(sentence_count: 2),
-      accepted_tos_version: organization.tos_version
+      accepted_tos_version: organization.tos_version + 1.hour
     )
   end
 
@@ -162,7 +163,7 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
     tos_agreement: true,
     personal_url: Faker::Internet.url,
     about: Faker::Lorem.paragraph(sentence_count: 2),
-    accepted_tos_version: organization.tos_version
+    accepted_tos_version: organization.tos_version + 1.hour
   )
 
   locked_user.lock_access!

data/lib/decidim/core/test/shared_examples/map_examples.rb

@@ -10,7 +10,9 @@ shared_context "with map utility" do
 end
 
 shared_context "with frontend map builder" do
-  subject { described_class.new(template, options) }
+  subject { builder_class.new(template, options) }
+
+  let(:builder_class) { described_class }
 
   let(:template_class) do
     Class.new(ActionView::Base) do
@@ -102,6 +104,7 @@ shared_context "with frontend map elements" do
     # context.
     final_html = html_document
     Rails.application.routes.draw do
+      get "maptiles/:z/:x/:y.png", to: ->(_) { [200, {}, [final_html]] }
       get "test_dynamic_map", to: ->(_) { [200, {}, [final_html]] }
       get "offline", to: ->(_) { [200, {}, [""]] }
     end

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.27.3"
+      "0.27.4"
     end
   end
 end

data/lib/decidim/core.rb

@@ -118,6 +118,12 @@ module Decidim
   include ActiveSupport::Configurable
   # Loads seeds from all engines.
   def self.seed!
+    # After running the migrations, some records may have loaded their column
+    # caches at different stages of the migration process, so in order to
+    # prevent any "undefined method" errors if these tasks are run
+    # consecutively, reset the column cache before the migrations.
+    reset_all_column_information
+
     # Faker needs to have the `:en` locale in order to work properly, so we
     # must enforce it during the seeds.
     original_locale = I18n.available_locales
@@ -157,6 +163,17 @@ module Decidim
     I18n.available_locales = original_locale
   end
 
+  # Finds all currently loaded Decidim ActiveRecord classes and resets their
+  # column information.
+  def self.reset_all_column_information
+    ActiveRecord::Base.descendants.each do |cls|
+      next if cls.name.nil? # abstract classes registered during tests
+      next if cls.abstract_class? || !cls.name.match?(/^Decidim::/)
+
+      cls.reset_column_information
+    end
+  end
+
   # Exposes a configuration option: The application name String.
   config_accessor :application_name
 

data/lib/decidim/form_builder.rb

@@ -181,7 +181,6 @@ module Decidim
     #                      or 'full' (optional) (default: 'basic')
     #           :lines - The Integer to indicate how many lines should editor have (optional) (default: 10)
     #           :disabled - Whether the editor should be disabled
-    #           :editor_images - Allow attached images (optional) (default: false)
     #
     # Renders a container with both hidden field and editor container
     def editor(name, options = {})
@@ -199,9 +198,12 @@ module Decidim
         template += label(name, label_text + required_for_attribute(name)) if options.fetch(:label, true)
         template += hidden_field(name, hidden_options)
         template += content_tag(:div, nil, class: "editor-container #{"js-hashtags" if hashtaggable}", data: {
-          toolbar: toolbar,
-          disabled: options[:disabled]
-        }.merge(editor_images_options(options)), style: "height: #{lines}rem")
+                                  toolbar: toolbar,
+                                  disabled: options[:disabled],
+                                  editor_images: true,
+                                  upload_images_path: Decidim::Core::Engine.routes.url_helpers.editor_images_path,
+                                  drag_and_drop_help_text: I18n.t("drag_and_drop_help", scope: "decidim.editor_images")
+                                }, style: "height: #{lines}rem")
         template += error_for(name, options) if error?(name)
         template.html_safe
       end
@@ -926,15 +928,6 @@ module Decidim
       end
     end
 
-    def editor_images_options(options)
-      return {} unless options[:editor_images]
-
-      {
-        upload_images_path: Decidim::Core::Engine.routes.url_helpers.editor_images_path,
-        drag_and_drop_help_text: I18n.t("drag_and_drop_help", scope: "decidim.editor_images")
-      }
-    end
-
     # Private: Determines the correct resource class for validators from the
     # object or its PassthruValidator.
     def resource_class(attribute)

data/lib/tasks/upgrade/decidim_user_moderation.rake

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :upgrade do
+    namespace :moderation do
+      desc "Add all blocked users to global moderation panel"
+      task fix_blocked_user_panel: :environment do
+        Decidim::UserBlock.find_each do |blocked_user|
+          Decidim::UserModeration.where(user: blocked_user.user).first_or_create!
+        end
+      end
+    end
+  end
+end