decidim-consultations 0.26.2 → 0.27.0.rc1

data/config/locales/fi-plain.yml

@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
@@ -251,9 +252,9 @@ fi-pl:
       filters:
         active: Aktiiviset
         all: Kaikki
+        date: Päivämäärä
         finished: Valmiit
         search: Hae
-        state: Tila
         upcoming: Tulevat
       filters_small_view:
         close_modal: Sulje ikkuna

data/config/locales/fi.yml

@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -251,9 +252,9 @@ fi:
       filters:
         active: Aktiiviset
         all: Kaikki
+        date: Päivämäärä
         finished: Valmiit
         search: Hae
-        state: Tila
         upcoming: Tulevat
       filters_small_view:
         close_modal: Sulje ikkuna

data/config/locales/fr-CA.yml

@@ -1,3 +1,4 @@
+---
 fr-CA:
   activemodel:
     attributes:
@@ -251,9 +252,9 @@ fr-CA:
       filters:
         active: Actives
         all: Tout
+        date: Date
         finished: Passées
         search: Rechercher
-        state: État
         upcoming: À venir
       filters_small_view:
         close_modal: Fermer la fenêtre

data/config/locales/fr.yml

@@ -1,3 +1,4 @@
+---
 fr:
   activemodel:
     attributes:
@@ -251,9 +252,9 @@ fr:
       filters:
         active: Actives
         all: Tout
+        date: Date
         finished: Passées
         search: Rechercher
-        state: État
         upcoming: À venir
       filters_small_view:
         close_modal: Fermer la fenêtre

data/config/locales/ga-IE.yml

@@ -1,3 +1,4 @@
+---
 ga:
   activemodel:
     attributes:
@@ -95,7 +96,6 @@ ga:
         all: Uile
         finished: Críochnaithe
         search: Cuardaigh
-        state: Stádas
         upcoming: Le teacht
       filters_small_view:
         filter: Scag

data/config/locales/gl.yml

@@ -1,3 +1,4 @@
+---
 gl:
   activemodel:
     attributes:
@@ -197,9 +198,9 @@ gl:
       filters:
         active: Activo
         all: Todo
+        date: Data
         finished: Terminado
         search: Busca
-        state: Estado
         upcoming: Próximos
       filters_small_view:
         close_modal: Pechar ventá

data/config/locales/hr.yml

@@ -1 +1,2 @@
+---
 hr:

data/config/locales/hu.yml

@@ -1,3 +1,4 @@
+---
 hu:
   activemodel:
     attributes:
@@ -248,9 +249,9 @@ hu:
       filters:
         active: Aktív
         all: Összes
+        date: Dátum
         finished: Befejezett
         search: Keresés
-        state: Állapot
         upcoming: Közelgő
       filters_small_view:
         close_modal: Ablak bezárása

data/config/locales/id-ID.yml

@@ -1,3 +1,4 @@
+---
 id:
   activemodel:
     attributes:
@@ -191,7 +192,6 @@ id:
         all: Semua
         finished: Jadi
         search: Pencarian
-        state: Negara
         upcoming: Mendatang
       filters_small_view:
         close_modal: Tutup jendela

data/config/locales/is-IS.yml

@@ -1,4 +1,5 @@
-is-IS:
+---
+is:
   activemodel:
     attributes:
       consultation:

data/config/locales/it.yml

@@ -1,3 +1,4 @@
+---
 it:
   activemodel:
     attributes:
@@ -253,7 +254,6 @@ it:
         all: Tutti
         finished: Finito
         search: Ricerca
-        state: Stato
         upcoming: Prossime
       filters_small_view:
         close_modal: Chiudi la finestra

data/config/locales/ja.yml

@@ -1,3 +1,4 @@
+---
 ja:
   activemodel:
     attributes:
@@ -243,9 +244,9 @@ ja:
       filters:
         active: アクティブ
         all: すべて
+        date: 日付
         finished: 完了
         search: 検索
-        state: ステータス
         upcoming: 近日公開
       filters_small_view:
         close_modal: ウィンドウを閉じる

data/config/locales/ko.yml

@@ -1 +1,2 @@
+---
 ko:

data/config/locales/lb.yml

@@ -1,3 +1,4 @@
+---
 lb:
   activemodel:
     attributes:
@@ -176,7 +177,6 @@ lb:
         all: Alle
         finished: Fertig
         search: Suche
-        state: Zustand
         upcoming: Bevorstehende
       filters_small_view:
         close_modal: Fenster schließen

data/config/locales/lt.yml

@@ -1 +1,2 @@
+---
 lt:

data/config/locales/lv.yml

@@ -1,3 +1,4 @@
+---
 lv:
   activemodel:
     attributes:
@@ -258,7 +259,6 @@ lv:
         all: Visi
         finished: Pabeigtas
         search: Meklēt
-        state: Statuss
         upcoming: Gaidāmās
       filters_small_view:
         close_modal: Aizvērt logu

data/config/locales/mt.yml

@@ -1 +1,2 @@
+---
 mt:

data/config/locales/nl.yml

@@ -1,3 +1,4 @@
+---
 nl:
   activemodel:
     attributes:
@@ -253,7 +254,6 @@ nl:
         all: Alle
         finished: Voltooid
         search: Zoeken
-        state: Staat
         upcoming: Toekomstige
       filters_small_view:
         close_modal: Sluit venster

data/config/locales/no.yml

@@ -1,3 +1,4 @@
+---
 "no":
   activemodel:
     attributes:
@@ -253,7 +254,6 @@
         all: Alle
         finished: Fullført
         search: Søk
-        state: Status
         upcoming: Kommende
       filters_small_view:
         close_modal: Lukk vindu

data/config/locales/om-ET.yml

@@ -1 +1,2 @@
+---
 om:

data/config/locales/pl.yml

@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
@@ -269,7 +270,6 @@ pl:
         all: Wszystko
         finished: Zakończone
         search: Szukaj
-        state: Status
         upcoming: Nadchodzące
       filters_small_view:
         close_modal: Zamknij okno

data/config/locales/pt-BR.yml

@@ -1,4 +1,5 @@
-pt-BR:
+---
+pt:
   activemodel:
     attributes:
       consultation:
@@ -253,7 +254,6 @@ pt-BR:
         all: Todos
         finished: Acabado
         search: Pesquisa
-        state: Estado
         upcoming: próximos
       filters_small_view:
         close_modal: Janela fechada

data/config/locales/pt.yml

@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -253,7 +254,6 @@ pt:
         all: Todos
         finished: Acabado
         search: Pesquisar
-        state: Estado
         upcoming: Próximas
       filters_small_view:
         close_modal: Fechar janela

data/config/locales/ro-RO.yml

@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -259,9 +260,9 @@ ro:
       filters:
         active: Activ
         all: Toate
+        date: Data
         finished: Terminat
         search: Caută
-        state: Status
         upcoming: Urmează
       filters_small_view:
         close_modal: Închide fereastra

data/config/locales/ru.yml

@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     attributes:
@@ -203,7 +204,6 @@ ru:
         all: Все
         finished: Завершившиеся
         search: Поиск
-        state: Cостояние
         upcoming: Предстоящие
       filters_small_view:
         close_modal: Закрыть окно

data/config/locales/si-LK.yml

@@ -1 +1,2 @@
+---
 si:

data/config/locales/sk.yml

@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
@@ -266,7 +267,6 @@ sk:
         all: Všetko
         finished: Dokončené
         search: Hľadať
-        state: Stav
         upcoming: Nadchádzajúce
       filters_small_view:
         close_modal: Zavrieť okno

data/config/locales/sl.yml

@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:

data/config/locales/so-SO.yml

@@ -1 +1,2 @@
+---
 so:

data/config/locales/sr-CS.yml

@@ -1 +1,2 @@
+---
 sr:

data/config/locales/sv.yml

@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -251,9 +252,9 @@ sv:
       filters:
         active: Aktiv
         all: Alla
+        date: Datum
         finished: Avslutade
         search: Sök
-        state: Status
         upcoming: Kommande
       filters_small_view:
         close_modal: Stäng fönstret

data/config/locales/sw-KE.yml

@@ -1 +1,2 @@
+---
 sw:

data/config/locales/ti-ER.yml

@@ -1 +1,2 @@
+---
 ti:

data/config/locales/tr-TR.yml

@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -252,7 +253,6 @@ tr:
         all: Tümü
         finished: Bitti
         search: Arama
-        state: Statü
         upcoming: Yaklaşan
       filters_small_view:
         close_modal: Pencereyi kapat

data/config/locales/uk.yml

@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
@@ -203,7 +204,6 @@ uk:
         all: Усі
         finished: Завершені
         search: Шукати
-        state: Стан
         upcoming: Прийдешні
       filters_small_view:
         close_modal: Закрити вікно

data/config/locales/val-ES.yml

@@ -1 +1,2 @@
+---
 val:

data/config/locales/vi.yml

@@ -1 +1,2 @@
+---
 vi:

data/config/locales/zh-CN.yml

@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -244,7 +245,6 @@ zh-CN:
         all: 所有的
         finished: 已完成
         search: 搜索
-        state: 状态
         upcoming: 即将到来的
       filters_small_view:
         close_modal: 关闭窗口

data/config/locales/zh-TW.yml

@@ -1 +1,2 @@
+---
 zh-TW:

data/lib/decidim/consultations/participatory_space.rb

@@ -50,7 +50,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
       start_voting_date: Time.zone.today,
       end_voting_date: Time.zone.today + 1.month,
       organization: organization,
-      banner_image: ActiveStorage::Blob.create_after_upload!(
+      banner_image: ActiveStorage::Blob.create_and_upload!(
         io: File.open(File.join(seeds_root, "city2.jpeg")),
         filename: "banner_image.jpeg",
         content_type: "image/jpeg",
@@ -82,7 +82,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
       start_voting_date: Time.zone.today - 2.months,
       end_voting_date: Time.zone.today - 1.month,
       organization: organization,
-      banner_image: ActiveStorage::Blob.create_after_upload!(
+      banner_image: ActiveStorage::Blob.create_and_upload!(
         io: File.open(File.join(seeds_root, "city2.jpeg")),
         filename: "banner_image.jpeg",
         content_type: "image/jpeg",
@@ -113,7 +113,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
       start_voting_date: Time.zone.today + 1.month + 1.day,
       end_voting_date: Time.zone.today + 2.months,
       organization: organization,
-      banner_image: ActiveStorage::Blob.create_after_upload!(
+      banner_image: ActiveStorage::Blob.create_and_upload!(
         io: File.open(File.join(seeds_root, "city2.jpeg")),
         filename: "banner_image.jpeg",
         content_type: "image/jpeg",
@@ -148,13 +148,13 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
             Decidim::Faker::Localized.paragraph(sentence_count: 3)
           end,
           organization: organization,
-          hero_image: ActiveStorage::Blob.create_after_upload!(
+          hero_image: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(seeds_root, "city.jpeg")),
             filename: "hero_image.jpeg",
             content_type: "image/jpeg",
             metadata: nil
           ), # Keep after organization
-          banner_image: ActiveStorage::Blob.create_after_upload!(
+          banner_image: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(seeds_root, "city2.jpeg")),
             filename: "banner_image.jpeg",
             content_type: "image/jpeg",
@@ -188,7 +188,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
           description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: question,
           content_type: "image/jpeg",
-          file: ActiveStorage::Blob.create_after_upload!(
+          file: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(seeds_root, "city.jpeg")),
             filename: "city.jpeg",
             content_type: "image/jpeg",
@@ -201,7 +201,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
           description: Decidim::Faker::Localized.sentence(word_count: 5),
           attached_to: question,
           content_type: "application/pdf",
-          file: ActiveStorage::Blob.create_after_upload!(
+          file: ActiveStorage::Blob.create_and_upload!(
             io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
             filename: "Exampledocument.pdf",
             content_type: "application/pdf",

data/lib/decidim/consultations/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     def self.version
-      "0.26.2"
+      "0.27.0.rc1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-consultations
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.27.0.rc1
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.2
+        version: 0.27.0.rc1
 description: Extends Decidim adding a first level public consultation component
 email:
 - jsperezg@gmail.com
@@ -182,7 +182,6 @@ files:
 - app/queries/decidim/consultations/organization_active_consultations.rb
 - app/queries/decidim/consultations/organization_consultations.rb
 - app/queries/decidim/consultations/organization_questions.rb
-- app/services/decidim/consultations/consultation_search.rb
 - app/views/decidim/consultations/_consultation.html.erb
 - app/views/decidim/consultations/admin/consultations/_form.html.erb
 - app/views/decidim/consultations/admin/consultations/edit.html.erb
@@ -377,14 +376,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Decidim consultations module

data/app/services/decidim/consultations/consultation_search.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Consultations
-    # Service that encapsulates all logic related to filtering consultations.
-    class ConsultationSearch < Searchlight::Search
-      # Public: Initializes the service.
-      # page        - The page number to paginate the results.
-      # per_page    - The number of proposals to return per page.
-      def initialize(options = {})
-        super(options)
-      end
-
-      def base_query
-        Decidim::Consultation.where(organization: options[:organization]).published
-      end
-
-      # Handle the search_text filter
-      def search_search_text
-        query
-          .where(Arel.sql("title->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
-          .or(
-            query.where(Arel.sql("description->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
-          )
-          .or(
-            query.where(Arel.sql("subtitle->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
-          )
-      end
-
-      # Handle the state filter
-      def search_state
-        case state
-        when "active"
-          query.active
-        when "upcoming"
-          query.upcoming
-        when "finished"
-          query.finished
-        else # Assume all
-          query
-        end
-      end
-
-      private
-
-      def current_locale
-        I18n.locale.to_s
-      end
-    end
-  end
-end