decidim-core 0.26.0.rc2 → 0.26.0

data/config/locales/sv.yml

@@ -78,6 +78,28 @@ sv:
       decidim_with_month_name_short: "%d %b"
   datetime:
     distance_in_words:
+      about_x_hours:
+        one: ungefär 1 timme
+        other: ungefär %{count} timmar
+      about_x_months:
+        one: ungefär 1 månad
+        other: ungefär %{count} månader
+      half_a_minute: en halv minut
+      less_than_x_minutes:
+        one: mindre än en minut
+        other: mindre än %{count} minut
+      less_than_x_seconds:
+        one: just nu
+        other: mindre än %{count} sekunder
+      x_days:
+        one: 1 dag sedan
+        other: "%{count} dagar sedan"
+      x_hours:
+        one: 1 timme sedan
+        other: "%{count} timmar sedan"
+      x_minutes:
+        one: 1 min sedan
+        other: "%{count} min sedan"
       x_seconds:
         one: 1 sek. sedan
         other: "%{count} sek. sedan"
@@ -159,6 +181,7 @@ sv:
         block: "%{user_name} blockerade användaren %{resource_name}"
         invite: "%{user_name} bjöd in användaren %{resource_name} med rollen: %{role}"
         officialize: "%{user_name} gjorde deltagaren %{resource_name} officiell"
+        promote: "%{user_name} befordrade %{resource_name}"
         remove_from_admin: "%{user_name} tog bort deltagaren %{resource_name} med rollen: %{role}"
         show_email: "%{user_name} hämtade e-postadressen för deltagaren %{resource_name}"
         transfer: "%{user_name} överförde deltagaren %{resource_name}"
@@ -981,6 +1004,7 @@ sv:
         show:
           back: Tillbaka till alla konversationer
           chat_with: Konversation med
+          deleted_accounts: Du kan inte meddela raderade konton.
           not_allowed: Deltagaren tar inte emot direktmeddelanden.
           title: Samtal med %{usernames}
         start:
@@ -1048,6 +1072,12 @@ sv:
         greetings: Hälsningar,<br/>%{organization_name}<br/><a href="%{organization_url}">%{organization_url}</a>
         hello: Hallå,
         subject: Vill du fortsätta att få relevant information om %{organization_name}?
+    notification_mailer:
+      event_received:
+        no_translation_available: Tyvärr kunde maskinöversättningen inte hämtas när e-postmeddelandet skickades. Du kan kontrollera översättningen av originaltexten på följande länk %{link}.
+        original_text: 'Originaltext:'
+        same_language: Innehållet har skrevs i ditt valda språk (%{language}) så ingen automatisk översättning visas i detta e-post.
+        translated_text: 'Maskinöversatt text:'
     notifications:
       no_notifications: Inga meddelanden ännu.
     notifications_settings:
@@ -1345,6 +1375,7 @@ sv:
         title_reply: Svara
       show:
         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}
       update:
@@ -1642,10 +1673,12 @@ sv:
     name: Svenska
     name_with_error: Svenska (fel!)
   password_validator:
+    blacklisted: är svartlistad
     domain_included_in_password: är för likt detta domännamn
     email_included_in_password: är för likt din e-post
     fallback: är inte giltigt
     name_included_in_password: är för likt ditt namn
+    nickname_included_in_password: är för likt ditt användarnamn
     not_enough_unique_characters: har inte tillräckligt med unika tecken
     password_not_allowed: är ej tillåtet
     password_too_common: är för vanligt
@@ -1680,6 +1713,8 @@ sv:
       day_of_week: "%a"
       day_of_week_long: "%a %e"
       day_of_year: "%d.%m.%y"
+      ddmm: "%d/%m"
+      ddmmyyyy: "%d/%m/%Y"
       decidim_day_of_year: "%d %B %Y"
       decidim_short: "%d/%m/%Y %H:%M"
       default: "%d %B %Y kl.%H:%M:%S"

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

@@ -37,6 +37,40 @@ shared_examples "searchable results" do
       end
     end
 
+    context "when moderation is involved" do
+      it "not contains these searchables" do
+        expect(searchables).not_to be_empty
+        expect(term).not_to be_empty
+
+        fill_in "term", with: term
+        find("input#term").native.send_keys :enter
+
+        expect(page).to have_current_path decidim.search_path, ignore_query: true
+        expect(page).to have_content(/results for the search: "#{term}"/i)
+        expect(page).to have_selector(".filters__section")
+        expect(page.find("#search-count .section-heading").text.to_i).to be_positive
+
+        searchables.each do |searchable|
+          next unless searchable.is_a?(Decidim::Reportable)
+
+          create(:moderation, reportable: searchable, hidden_at: Time.current)
+          # rubocop:disable Rails/SkipsModelValidations
+          searchable.reload.touch
+          # rubocop:enable Rails/SkipsModelValidations
+        end
+
+        visit decidim.root_path
+
+        fill_in "term", with: term
+        find("input#term").native.send_keys :enter
+
+        expect(page).to have_current_path decidim.search_path, ignore_query: true
+        expect(page).to have_content(/results for the search: "#{term}"/i)
+        expect(page).to have_selector(".filters__section")
+        expect(page.find("#search-count .section-heading").text.to_i).not_to be_positive
+      end
+    end
+
     context "when participatory space is not visible" do
       shared_examples_for "no searchs found" do
         it "not contains these searchables" do

data/lib/decidim/core/version.rb

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

data/lib/decidim/map/autocomplete.rb

@@ -57,11 +57,7 @@ module Decidim
             @template.snippets.add(:head, @template.snippets.for(:geocoding))
           end
 
-          options[:value] ||= object.send(attribute) if object.respond_to?(attribute)
-          if object.respond_to?(:latitude) && object.respond_to?(:longitude)
-            point = [object.latitude, object.longitude]
-            options["data-coordinates"] ||= point.join(",")
-          end
+          options = merge_geocoding_options(attribute, options)
 
           field(attribute, options) do |opts|
             builder.geocoding_field(
@@ -71,6 +67,17 @@ module Decidim
             )
           end
         end
+
+        private
+
+        def merge_geocoding_options(attribute, options)
+          options[:value] ||= object.send(attribute) if object.respond_to?(attribute)
+          if object.respond_to?(:latitude) && object.respond_to?(:longitude) && object.latitude.present? && object.longitude.present?
+            point = [object.latitude, object.longitude]
+            options["data-coordinates"] ||= point.join(",")
+          end
+          options
+        end
       end
     end
   end

data/lib/decidim/resourceable.rb

@@ -51,6 +51,7 @@ module Decidim
 
         scope = manifest.resource_scope(component)
         scope = scope.where("#{self.class.table_name}.id != ?", id) if manifest.model_class == self.class
+        scope = scope.not_hidden if manifest.model_class.respond_to?(:not_hidden)
         scope.includes(:component).where.not(decidim_components: { published_at: nil })
       end
 

data/lib/decidim/searchable.rb

@@ -54,11 +54,12 @@ module Decidim
         end
       end
 
+      after_touch do |searchable|
+        remove_from_index(searchable) if searchable.respond_to?(:hidden?) && searchable.hidden?
+      end
+
       after_destroy do |searchable|
-        if self.class.search_resource_fields_mapper
-          org = self.class.search_resource_fields_mapper.retrieve_organization(searchable)
-          searchable.searchable_resources.by_organization(org.id).destroy_all
-        end
+        remove_from_index(searchable) if self.class.search_resource_fields_mapper
       end
       # after_create and after_update callbacks are dynamically setted in `searchable_fields` method.
 
@@ -70,6 +71,11 @@ module Decidim
         add_to_index_as_search_resource
       end
 
+      def remove_from_index(searchable)
+        org = self.class.search_resource_fields_mapper.retrieve_organization(searchable)
+        searchable.searchable_resources.by_organization(org.id).destroy_all
+      end
+
       # Forces the model to be indexed for the first time.
       def add_to_index_as_search_resource
         fields = self.class.search_resource_fields_mapper.mapped(self)

data/lib/tasks/upgrade/decidim_moderation_tasks.rake

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :upgrade do
+    namespace :moderation do
+      desc "Exclude all moderated content from search"
+      task remove_from_search: :environment do
+        query = Decidim::Moderation.hidden
+
+        log_info "Found #{query.count} hidden resources that needs to be handled"
+
+        query.find_each do |moderation|
+          moderation.reportable.remove_from_index(moderation.reportable)
+        rescue NameError => e
+          log_error "Could not process moderation id #{moderation.id} : #{e.message}"
+        end
+      end
+
+      private
+
+      def log_info(msg)
+        puts msg
+        Rails.logger.info(msg)
+      end
+
+      def log_error(msg)
+        puts msg
+        Rails.logger.error(msg)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.26.0.rc2
+  version: 0.26.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -754,28 +754,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.0
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -2555,6 +2555,7 @@ files:
 - lib/tasks/decidim_open_data_tasks.rake
 - lib/tasks/decidim_tasks.rake
 - lib/tasks/decidim_webpacker_tasks.rake
+- lib/tasks/upgrade/decidim_moderation_tasks.rake
 homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
@@ -2570,9 +2571,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: