decidim-core 0.24.2 → 0.24.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab5095df3a838b44266df05ea2907b58743c104adb1a61af39919a003ceeab25
-  data.tar.gz: 79816ce45c6d0d505cefd28199a8271b40cefa88d057d0c25df9abae4a5a6b1a
+  metadata.gz: f3951a2b1d212641b4f8d6d237c46f04a51acdba30baaf937d051ddc1a5a657b
+  data.tar.gz: 91ede7442a9ba6ccc60328bcea6384962e93ebffa195efca31a0ba27aae35eac
 SHA512:
-  metadata.gz: c9d199e7ba25fb0fe25b650672c9a1c275080377e4df96378953462056342efc078849648a3c7421fab19541eecfc7d35cb96ac23a7dfd6850f131e2b01e29c6
-  data.tar.gz: 9076c3518c1b64cc06a16a95f562342fb5b75d6b6592f2c8c55e2cb74003f2da6bad11521da43a89890485e8daeb49e7502967b2e94e5ac688e4ce26c852412d
+  metadata.gz: dd77e400d4d79c85b294f128a401f9408e2b8acf964cba301cf88cb53ca4305683bebf735e3e66092a3f7a66c774f9be3db6244eae9367b90c54e6a51ddfb4d5
+  data.tar.gz: 9fb9dede7ce22aebcb6d83fd83e076d1926cbaceefecc033fce2ff19d4837a759abb82dc67caf5438435d1e868df77c1481d0e59d28952f0a4942dfe1a4f0675

data/app/assets/javascripts/decidim/editor/linebreak_module.js.es6

@@ -10,6 +10,8 @@
   const Delta = Quill.import("delta");
   const Break = Quill.import("blots/break");
   const Embed = Quill.import("blots/embed");
+  const Scroll = Quill.import("blots/scroll");
+  const Parchment = Quill.import("parchment");
   const { HistoryOverride } = exports.Decidim.Editor
   Quill.register({"modules/history": HistoryOverride}, true)
   let icons = Quill.import("ui/icons");
@@ -31,6 +33,101 @@
   }
   Quill.register(SmartBreak);
 
+  // Override quill/blots/scroll.js
+  class ScrollOvderride extends Scroll {
+    optimize(mutations = [], context = {}) {
+      if (this.batch === true) {
+        return;
+      }
+
+      this.parchmentOptimize(mutations, context);
+
+      if (mutations.length > 0) {
+        // quill/core/emitter.js, Emitter.events.SCROLL_OPTIMIZE = "scroll-optimize"
+        this.emitter.emit("scroll-optimize", mutations, context);
+      }
+    }
+
+    // Override parchment/src/blot/scroll.ts
+    parchmentOptimize(mutations = [], context = {}) {
+      // super.optimize(context);
+      Reflect.apply(Parchment.Container.prototype.optimize, this, [context]);
+
+      // We must modify mutations directly, cannot make copy and then modify
+      // let records = [].slice.call(this.observer.takeRecords());
+      let records = [...this.observer.takeRecords()];
+      // Array.push currently seems to be implemented by a non-tail recursive function
+      // so we cannot just mutations.push.apply(mutations, this.observer.takeRecords());
+      while (records.length > 0) {
+        mutations.push(records.pop());
+      }
+      let mark = (blot, markParent) => {
+        if (!blot || blot === this) {
+          return;
+        }
+        if (!blot.domNode.parentNode) {
+          return;
+        }
+        if (blot.domNode.__blot && blot.domNode.__blot.mutations === null) {
+          blot.domNode.__blot.mutations = [];
+        }
+        if (markParent) {
+          mark(blot.parent);
+        }
+      };
+      let optimize = (blot) => {
+        // Post-order traversal
+        if (!blot.domNode.__blot) {
+          return;
+        }
+
+        if (blot instanceof Parchment.Container) {
+          blot.children.forEach(optimize);
+        }
+        blot.optimize(context);
+      };
+      let remaining = mutations;
+      for (let ind = 0; remaining.length > 0; ind += 1) {
+        // MAX_OPTIMIZE_ITERATIONS = 100
+        if (ind >= 100) {
+          throw new Error("[Parchment] Maximum optimize iterations reached");
+        }
+        remaining.forEach((mutation) => {
+          let blot = Parchment.find(mutation.target, true);
+          if (!blot) {
+            return;
+          }
+          if (blot.domNode === mutation.target) {
+            if (mutation.type === "childList") {
+              mark(Parchment.find(mutation.previousSibling, false));
+
+              mutation.addedNodes.forEach((node) => {
+                let child = Parchment.find(node, false);
+                mark(child, false);
+                if (child instanceof Parchment.Container) {
+                  child.children.forEach(function(grandChild) {
+                    mark(grandChild, false);
+                  });
+                }
+              });
+            } else if (mutation.type === "attributes") {
+              mark(blot.prev);
+            }
+          }
+          mark(blot);
+        });
+        this.children.forEach(optimize);
+        remaining = [...this.observer.takeRecords()];
+        records = remaining.slice();
+        while (records.length > 0) {
+          mutations.push(records.pop());
+        }
+      }
+    }
+  }
+  Quill.register("blots/scroll", ScrollOvderride, true);
+  Parchment.register(ScrollOvderride);
+
   const lineBreakButtonHandler = (quill) => {
     let range = quill.selection.getRange()[0];
     let currentLeaf = quill.getLeaf(range.index)[0];

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Shared behaviour for signed_in users that require the latest TOS accepted
+  module HasStoredPath
+    extend ActiveSupport::Concern
+
+    included do
+      # Saves the location before loading each page so we can return to the
+      # right page.
+      before_action :store_current_location
+    end
+
+    # Stores the url where the user will be redirected after login.
+    #
+    # Uses the `redirect_url` param or the current url if there's no param.
+    # In Devise controllers we only store the URL if it's from the params, we don't
+    # want to overwrite the stored URL for a Devise one.
+    def store_current_location
+      return if skip_store_location?
+
+      value = redirect_url || request.url
+      store_location_for(:user, value)
+    end
+
+    def skip_store_location?
+      # Skip if Devise already handles the redirection
+      return true if devise_controller? && redirect_url.blank?
+      # Skip for all non-HTML requests"
+      return true unless request.format.html?
+      # Skip if a signed in user requests the TOS page without having agreed to
+      # the TOS. Most of the times this is because of a redirect to the TOS
+      # page (in which case the desired location is somewhere else after the
+      # TOS is agreed).
+      return true if current_user && !current_user.tos_accepted? && request.path == URI(tos_path).path
+
+      false
+    end
+  end
+end

data/app/controllers/decidim/application_controller.rb

@@ -11,6 +11,7 @@ module Decidim
     include NeedsPermission
     include PayloadInfo
     include ImpersonateUsers
+    include HasStoredPath
     include NeedsTosAccepted
     include HttpCachingDisabler
     include ActionAuthorization
@@ -36,10 +37,6 @@ module Decidim
                          ::Decidim::Admin::Permissions,
                          ::Decidim::Permissions)
 
-    # Saves the location before loading each page so we can return to the
-    # right page.
-    before_action :store_current_location
-
     before_action :store_machine_translations_toggle
     helper_method :machine_translations_toggled?
 
@@ -52,18 +49,6 @@ module Decidim
 
     private
 
-    # Stores the url where the user will be redirected after login.
-    #
-    # Uses the `redirect_url` param or the current url if there's no param.
-    # In Devise controllers we only store the URL if it's from the params, we don't
-    # want to overwrite the stored URL for a Devise one.
-    def store_current_location
-      return if skip_store_location?
-
-      value = redirect_url || request.url
-      store_location_for(:user, value)
-    end
-
     # This overrides Devise's method for extracting the path from the URL. We
     # want to ensure the path to be stored in the cookie is not too long in
     # order to avoid ActionDispatch::Cookies::CookieOverflow exception. If the
@@ -97,20 +82,6 @@ module Decidim
       RequestStore.store[:toggle_machine_translations]
     end
 
-    def skip_store_location?
-      # Skip if Devise already handles the redirection
-      return true if devise_controller? && redirect_url.blank?
-      # Skip for all non-HTML requests"
-      return true unless request.format.html?
-      # Skip if a signed in user requests the TOS page without having agreed to
-      # the TOS. Most of the times this is because of a redirect to the TOS
-      # page (in which case the desired location is somewhere else after the
-      # TOS is agreed).
-      return true if current_user && !current_user.tos_accepted? && request.path == tos_path
-
-      false
-    end
-
     def user_has_no_permission_path
       decidim.root_path
     end

data/app/helpers/decidim/filters_helper.rb

@@ -29,15 +29,6 @@ module Decidim
       end
     end
 
-    def filter_cache_hash(filter, type = nil)
-      hash = []
-      hash << "decidim/proposals/filters"
-      hash << type.to_s if type.present?
-      hash << Digest::MD5.hexdigest(filter.to_json)
-
-      hash.join("/")
-    end
-
     private
 
     # Creates a unique namespace for a filter form to prevent dupliacte IDs in

data/app/helpers/decidim/map_helper.rb

@@ -10,7 +10,7 @@ module Decidim
     # options - An optional hash of options (default: { zoom: 17 })
     #           * zoom: A number to represent the zoom value of the map
     def static_map_link(resource, options = {}, map_html_options = {}, &block)
-      return unless resource.geocoded?
+      return unless resource.geocoded_and_valid?
       return unless map_utility_static || map_utility_dynamic
 
       address_text = resource.try(:address)

data/app/views/decidim/newsletters/show.html.erb

@@ -1,5 +1,5 @@
 <% @cell = cell(
-  "decidim/newsletter_templates/basic_only_text",
+  "decidim/newsletter_templates/#{newsletter.template.manifest_name}",
   newsletter.template,
   organization: @organization,
   newsletter: newsletter,

data/config/locales/cs.yml

@@ -462,7 +462,7 @@ cs:
       registrations:
         new:
           already_have_an_account?: Máte již účet?
-          newsletter: Dostávejte příležitostný zpravodaj s relevantními informacemi
+          newsletter: Chci dostávat příležitostný zpravodaj s relevantními informacemi
           newsletter_title: Povolení kontaktu
           nickname_help: Váš alias v %{organization}. Může obsahovat pouze písmena, číslice, '-' a '_'.
           password_help: "%{minimun_characters} minimum znaků, nesmí být příliš běžné (např. 123456) a musí být jiné než vaše přezdívka a váš e-mail."

data/config/locales/pl.yml

@@ -383,7 +383,7 @@ pl:
             dummy_global_attribute_1: Przykładowy atrybut 1
             dummy_global_attribute_2: Przykładowy atrybut 2
             dummy_global_translatable_text: Przykładowy tekst do tłumaczenia
-            enable_pads_creation: Włącz tworzenie klocków
+            enable_pads_creation: Włącz tworzenie padów
             resources_permissions_enabled: Włączono uprawnienia do zasobów
             scope_id: Zakres
             scopes_enabled: Zakresy włączone
@@ -658,7 +658,7 @@ pl:
           email_outro: Otrzymałeś to powiadomienie, ponieważ jesteś autorem usuniętego zasobu.
           email_subject: '%{resource_type} został usunięty'
           notification_title: |-
-            Administrator usunął %{resource_type}, ponieważ zasób został zgłoszony jako %{report_reasons}.</br>
+            Administrator usunął %{resource_type}, ponieważ treść została zgłoszona jako %{report_reasons}.</br>
             <i>%{resource_content}</i>
       resource_endorsed:
         email_intro: '%{endorser_name} %{endorser_nickname}, którego śledzisz, właśnie zarekomendował(a) „%{resource_title}” i uważamy, że może Cię to zainteresować. Sprawdź i zadecyduj:'
@@ -1191,8 +1191,8 @@ pl:
         subject: Zasób został zgłoszony
     reports:
       create:
-        error: Wystąpił błąd podczas tworzenia raportu. Proszę spróbować ponownie.
-        success: Raport został utworzony z powodzeniem i zostanie zweryfikowany przez administratora.
+        error: Wystąpił błąd podczas tworzenia zgłoszenia. Proszę spróbować ponownie.
+        success: Zgłoszenie zostało utworzone z powodzeniem i zostanie zweryfikowane przez administratora.
     resource_endorsements:
       create:
         error: Wystąpił błąd podczas udzielania rekomendacji.
@@ -1259,7 +1259,7 @@ pl:
         description: Czy ta treść jest nieodpowiednia?
         does_not_belong: Promuje nielegalną działalność, groźby samobójcze, informacje osobiste lub coś innego, co według Ciebie nie powinno pojawić się w %{organization_name}.
         offensive: Promuje rasizm, seksizm, nienawiść, ataki osobiste, groźby śmierci, groźby samobójcze jakąkolwiek formę mowy nienawiści.
-        report: Raport
+        report: Zgłoś
         spam: Zawiera clickbaity, reklamy, oszustwa lub wrogie skrypty.
         title: Zgłoś nieodpowiednią zawartość
       flag_user_modal:

data/config/locales/ro-RO.yml

@@ -1265,6 +1265,8 @@ ro:
         does_not_belong: Conține activitate ilegală, amenințări de sinucidere, informații personale sau altceva care credeți că nu aparțin de %{organization_name}.
         offensive: Conține rasism, sexism, insulte, atacuri personale, amenințări cu moartea, cereri de sinucidere sau orice formă de discurs de incitare la ură.
         report: Raportează
+        spam: Conține clickbait, publicitate, escrocherii sau roboți script.
+        title: Raportează un utilizator nepotrivit
       floating_help:
         close: Închide Ajutor
         help: Ajutor
@@ -1293,6 +1295,10 @@ ro:
     tags:
       filter_results_for_category: 'Filtrează rezultatele pentru categoria: %{resource}'
       filter_results_for_scope: 'Filtrează rezultatele pentru scope: %{resource}'
+    translation_bar:
+      help_text: "<strong>Avertisment:</strong> Conținutul poate fi tradus automat și nu este 100% exact."
+      show_original: Afișați textul original
+      show_translated: Arată textul tradus automat
     user_activity:
       index:
         no_activities_warning: Acest participant nu a avut încă nicio activitate.
@@ -1336,6 +1342,13 @@ ro:
       update:
         error: A apărut o eroare la actualizarea intereselor tale.
         success: Interesele tale au fost actualizate cu succes.
+    user_report_mailer:
+      notify:
+        body_1: Utilizatorul %{user} a fost raportat de %{token}
+        body_2: 'Motiv: %{reason}'
+        greetings: Salutări,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
+        hello: Bună ziua %{admin},
+        subject: Un nou utilizator a fost raportat în %{organization_name}
     version:
       show:
         back_to_resource: Mergi înapoi
@@ -1346,9 +1359,13 @@ ro:
         version_created_at: Versiune creată la
         version_number: Număr versiune
         version_number_out_of_total: "%{current_version} din %{total_count}"
+    version_author:
+      show:
+        deleted: Participant șters
     versions:
       resource_version:
         of_versions: "(din %{number})"
+        see_other_versions: afișați alte versiuni
         version: Versiunea %{number}
     versions_list:
       show:
@@ -1360,6 +1377,7 @@ ro:
       show:
         version_index: Versiunea %{index}
     welcome_notification:
+      default_body: <p>Bună ziua {{name}}, vă mulțumin că v-ați alăturat {{organization}} și bine ați venit!</p><ul><li>Dacă doriți să aveți o idee despre ceea ce puteți face aici, examinați secțiunea de <a href="{{help_url}}">Ajutor</a>.</li><li>După citirea acesteia veți primi primul ecuson. Aici este <a href="{{badges_url}}">lista tuturor ecusoanelor</a> pe care le puteți obține pe măsură ce participați în cadrul {{organization}}</li><li>Nu în ultimul rând, puteți să vă alăturați altor persoane, să împărtășiți cu acestea experiența dvs. de implicare și participare în cadrul {{organization}}. Formulați propuneri și comentarii, dezbateți, reflectați asupra modului de a contribui la binele comun, oferiți argumente pentru a convinge, ascultați și citiți pentru a vă lăsa convinși, exprimați-vă ideile în mod concret și direct, răspundeți ferm și cu răbdare, apărați-vă ideile și mențineți o atitudine deschisă pentru a colabora și a participa la ideile altora.</li></ul>
       default_subject: Îți mulțumim că te-ai alăturat {{organization}}!
     wizard_step_form:
       wizard_aside:
@@ -1574,6 +1592,11 @@ ro:
         instagram: "%{organization} la Instagram"
         twitter: "%{organization} pe Twitter"
         youtube: "%{organization} pe YouTube"
+      timeout_modal:
+        body: Ai fost inactiv de %{minutes} minute. Dacă continui să fii inactiv, vei fi deconectat automat pentru propria ta securitate.
+        continue_session: Continuă sesiunea
+        sign_out: Ieșiți
+        title: Vreți să continuați sesiunea?
       user_menu:
         account: 'Cont de utilizator: %{name}'
         admin_dashboard: Panou de administrare
@@ -1595,6 +1618,7 @@ ro:
         see_more: Vezi mai multe
   locale:
     name: Română
+    name_with_error: Română (eroare!)
   password_validator:
     domain_included_in_password: este prea similar cu acest nume de domeniu
     email_included_in_password: este prea asemănător cu adresa de e-mail

data/lib/decidim/core/version.rb

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

data/lib/decidim/geocodable.rb

@@ -27,6 +27,10 @@ module Decidim
     included do
       include Geocoder::Store::ActiveRecord
 
+      def geocoded_and_valid?
+        geocoded? && to_coordinates.none?(&:nan?)
+      end
+
       private
 
       # rubocop:disable Style/OptionalBooleanParameter

data/lib/decidim/reportable.rb

@@ -26,14 +26,14 @@ module Decidim
       #
       # Returns Boolean.
       def hidden?
-        moderation&.hidden_at&.present?
+        moderation&.hidden_at&.present? || false
       end
 
       # Public: Checks if the reportable has been reported or not.
       #
       # Returns Boolean.
       def reported?
-        moderation&.report_count&.positive?
+        moderation&.report_count&.positive? || false
       end
 
       # Public: The reported content url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.24.2
+  version: 0.24.3
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -858,28 +858,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.2
+        version: 0.24.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.2
+        version: 0.24.3
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.2
+        version: 0.24.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.2
+        version: 0.24.3
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1371,6 +1371,7 @@ files:
 - app/controllers/concerns/decidim/flaggable.rb
 - app/controllers/concerns/decidim/force_authentication.rb
 - app/controllers/concerns/decidim/form_factory.rb
+- app/controllers/concerns/decidim/has_stored_path.rb
 - app/controllers/concerns/decidim/http_caching_disabler.rb
 - app/controllers/concerns/decidim/impersonate_users.rb
 - app/controllers/concerns/decidim/locale_switcher.rb