decidim-consultations 0.26.5 → 0.27.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (106) hide show
  1. checksums.yaml +4 -4
  2. data/app/cells/decidim/consultations/content_blocks/highlighted_consultations/show.erb +2 -2
  3. data/app/commands/decidim/consultations/admin/create_consultation.rb +1 -1
  4. data/app/commands/decidim/consultations/admin/create_question.rb +1 -1
  5. data/app/commands/decidim/consultations/admin/create_response.rb +1 -1
  6. data/app/commands/decidim/consultations/admin/create_response_group.rb +1 -1
  7. data/app/commands/decidim/consultations/admin/destroy_response_group.rb +1 -1
  8. data/app/commands/decidim/consultations/admin/publish_consultation.rb +1 -1
  9. data/app/commands/decidim/consultations/admin/publish_consultation_results.rb +1 -1
  10. data/app/commands/decidim/consultations/admin/publish_question.rb +1 -1
  11. data/app/commands/decidim/consultations/admin/unpublish_consultation.rb +1 -1
  12. data/app/commands/decidim/consultations/admin/unpublish_consultation_results.rb +1 -1
  13. data/app/commands/decidim/consultations/admin/unpublish_question.rb +1 -1
  14. data/app/commands/decidim/consultations/admin/update_consultation.rb +1 -1
  15. data/app/commands/decidim/consultations/admin/update_question.rb +1 -1
  16. data/app/commands/decidim/consultations/admin/update_question_configuration.rb +1 -1
  17. data/app/commands/decidim/consultations/admin/update_response.rb +1 -1
  18. data/app/commands/decidim/consultations/admin/update_response_group.rb +1 -1
  19. data/app/commands/decidim/consultations/multiple_vote_question.rb +1 -1
  20. data/app/commands/decidim/consultations/unvote_question.rb +1 -1
  21. data/app/commands/decidim/consultations/vote_question.rb +1 -1
  22. data/app/controllers/decidim/consultations/consultations_controller.rb +5 -12
  23. data/app/forms/decidim/consultations/admin/consultation_form.rb +1 -1
  24. data/app/helpers/decidim/consultations/consultations_helper.rb +1 -1
  25. data/app/helpers/decidim/consultations/questions_helper.rb +3 -3
  26. data/app/models/decidim/consultation.rb +9 -3
  27. data/app/permissions/decidim/consultations/permissions.rb +1 -3
  28. data/app/presenters/decidim/consultations/question_stats_presenter.rb +4 -2
  29. data/app/queries/decidim/consultations/admin/admin_users.rb +1 -1
  30. data/app/queries/decidim/consultations/organization_active_consultations.rb +1 -1
  31. data/app/queries/decidim/consultations/organization_consultations.rb +1 -1
  32. data/app/queries/decidim/consultations/organization_questions.rb +1 -1
  33. data/app/views/decidim/consultations/_consultation.html.erb +1 -1
  34. data/app/views/decidim/consultations/consultations/_consultation_card.html.erb +1 -1
  35. data/app/views/decidim/consultations/consultations/_consultation_details.html.erb +1 -1
  36. data/app/views/decidim/consultations/consultations/_filters.html.erb +4 -4
  37. data/app/views/decidim/consultations/consultations/_question.html.erb +1 -1
  38. data/app/views/decidim/consultations/consultations/index.html.erb +3 -1
  39. data/app/views/decidim/consultations/question_multiple_votes/_voting_rules.html.erb +3 -1
  40. data/app/views/decidim/consultations/questions/_vote_button.html.erb +3 -1
  41. data/app/views/decidim/consultations/questions/_vote_modal_confirm.html.erb +1 -0
  42. data/app/views/decidim/consultations/questions/show.html.erb +3 -1
  43. data/app/views/layouts/decidim/_consultation_header.html.erb +1 -1
  44. data/app/views/layouts/decidim/_question_header.html.erb +1 -1
  45. data/config/locales/am-ET.yml +1 -0
  46. data/config/locales/ar.yml +2 -1
  47. data/config/locales/bg.yml +1 -0
  48. data/config/locales/ca.yml +2 -1
  49. data/config/locales/cs.yml +3 -2
  50. data/config/locales/da.yml +1 -0
  51. data/config/locales/de.yml +2 -1
  52. data/config/locales/el.yml +1 -1
  53. data/config/locales/en.yml +1 -1
  54. data/config/locales/eo.yml +1 -0
  55. data/config/locales/es-MX.yml +2 -1
  56. data/config/locales/es-PY.yml +2 -1
  57. data/config/locales/es.yml +2 -1
  58. data/config/locales/et.yml +1 -0
  59. data/config/locales/eu.yml +1 -1
  60. data/config/locales/fi-plain.yml +2 -1
  61. data/config/locales/fi.yml +2 -1
  62. data/config/locales/fr-CA.yml +3 -2
  63. data/config/locales/fr.yml +4 -3
  64. data/config/locales/ga-IE.yml +1 -1
  65. data/config/locales/gl.yml +2 -1
  66. data/config/locales/hr.yml +1 -0
  67. data/config/locales/hu.yml +2 -11
  68. data/config/locales/id-ID.yml +1 -1
  69. data/config/locales/is-IS.yml +2 -1
  70. data/config/locales/it.yml +1 -1
  71. data/config/locales/ja.yml +2 -1
  72. data/config/locales/ko.yml +1 -0
  73. data/config/locales/lb.yml +1 -3
  74. data/config/locales/lt.yml +1 -394
  75. data/config/locales/lv.yml +1 -1
  76. data/config/locales/mt.yml +1 -0
  77. data/config/locales/nl.yml +2 -2
  78. data/config/locales/no.yml +1 -1
  79. data/config/locales/om-ET.yml +1 -0
  80. data/config/locales/pl.yml +1 -1
  81. data/config/locales/pt-BR.yml +2 -2
  82. data/config/locales/pt.yml +1 -1
  83. data/config/locales/ro-RO.yml +2 -1
  84. data/config/locales/ru.yml +1 -3
  85. data/config/locales/si-LK.yml +1 -0
  86. data/config/locales/sk.yml +1 -1
  87. data/config/locales/sl.yml +1 -0
  88. data/config/locales/so-SO.yml +1 -0
  89. data/config/locales/sr-CS.yml +1 -0
  90. data/config/locales/sv.yml +2 -1
  91. data/config/locales/sw-KE.yml +1 -0
  92. data/config/locales/ti-ER.yml +1 -0
  93. data/config/locales/tr-TR.yml +1 -1
  94. data/config/locales/uk.yml +1 -3
  95. data/config/locales/val-ES.yml +1 -0
  96. data/config/locales/vi.yml +1 -0
  97. data/config/locales/zh-CN.yml +1 -1
  98. data/config/locales/zh-TW.yml +1 -0
  99. data/lib/decidim/consultations/participatory_space.rb +7 -7
  100. data/lib/decidim/consultations/version.rb +1 -1
  101. metadata +14 -19
  102. data/app/services/decidim/consultations/consultation_search.rb +0 -51
  103. data/config/locales/gn-PY.yml +0 -1
  104. data/config/locales/ka-GE.yml +0 -1
  105. data/config/locales/lo-LA.yml +0 -1
  106. data/config/locales/oc-FR.yml +0 -1
data/lib/decidim/consultations/participatory_space.rb CHANGED
@@ -50,7 +50,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
50
50
  start_voting_date: Time.zone.today,
51
51
  end_voting_date: Time.zone.today + 1.month,
52
52
  organization: organization,
53
- banner_image: ActiveStorage::Blob.create_after_upload!(
53
+ banner_image: ActiveStorage::Blob.create_and_upload!(
54
54
  io: File.open(File.join(seeds_root, "city2.jpeg")),
55
55
  filename: "banner_image.jpeg",
56
56
  content_type: "image/jpeg",
@@ -82,7 +82,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
82
82
  start_voting_date: Time.zone.today - 2.months,
83
83
  end_voting_date: Time.zone.today - 1.month,
84
84
  organization: organization,
85
- banner_image: ActiveStorage::Blob.create_after_upload!(
85
+ banner_image: ActiveStorage::Blob.create_and_upload!(
86
86
  io: File.open(File.join(seeds_root, "city2.jpeg")),
87
87
  filename: "banner_image.jpeg",
88
88
  content_type: "image/jpeg",
@@ -113,7 +113,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
113
113
  start_voting_date: Time.zone.today + 1.month + 1.day,
114
114
  end_voting_date: Time.zone.today + 2.months,
115
115
  organization: organization,
116
- banner_image: ActiveStorage::Blob.create_after_upload!(
116
+ banner_image: ActiveStorage::Blob.create_and_upload!(
117
117
  io: File.open(File.join(seeds_root, "city2.jpeg")),
118
118
  filename: "banner_image.jpeg",
119
119
  content_type: "image/jpeg",
@@ -148,13 +148,13 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
148
148
  Decidim::Faker::Localized.paragraph(sentence_count: 3)
149
149
  end,
150
150
  organization: organization,
151
- hero_image: ActiveStorage::Blob.create_after_upload!(
151
+ hero_image: ActiveStorage::Blob.create_and_upload!(
152
152
  io: File.open(File.join(seeds_root, "city.jpeg")),
153
153
  filename: "hero_image.jpeg",
154
154
  content_type: "image/jpeg",
155
155
  metadata: nil
156
156
  ), # Keep after organization
157
- banner_image: ActiveStorage::Blob.create_after_upload!(
157
+ banner_image: ActiveStorage::Blob.create_and_upload!(
158
158
  io: File.open(File.join(seeds_root, "city2.jpeg")),
159
159
  filename: "banner_image.jpeg",
160
160
  content_type: "image/jpeg",
@@ -188,7 +188,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
188
188
  description: Decidim::Faker::Localized.sentence(word_count: 5),
189
189
  attached_to: question,
190
190
  content_type: "image/jpeg",
191
- file: ActiveStorage::Blob.create_after_upload!(
191
+ file: ActiveStorage::Blob.create_and_upload!(
192
192
  io: File.open(File.join(seeds_root, "city.jpeg")),
193
193
  filename: "city.jpeg",
194
194
  content_type: "image/jpeg",
@@ -201,7 +201,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
201
201
  description: Decidim::Faker::Localized.sentence(word_count: 5),
202
202
  attached_to: question,
203
203
  content_type: "application/pdf",
204
- file: ActiveStorage::Blob.create_after_upload!(
204
+ file: ActiveStorage::Blob.create_and_upload!(
205
205
  io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
206
206
  filename: "Exampledocument.pdf",
207
207
  content_type: "application/pdf",
data/lib/decidim/consultations/version.rb CHANGED
@@ -3,7 +3,7 @@
3
3
  module Decidim
4
4
  module Consultations
5
5
  def self.version
6
- "0.26.5"
6
+ "0.27.0.rc1"
7
7
  end
8
8
  end
9
9
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decidim-consultations
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.26.5
4
+ version: 0.27.0.rc1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juan Salvador Perez Garcia
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-02-13 00:00:00.000000000 Z
11
+ date: 2022-06-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: decidim-admin
@@ -16,56 +16,56 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.26.5
19
+ version: 0.27.0.rc1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.26.5
26
+ version: 0.27.0.rc1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: decidim-comments
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 0.26.5
33
+ version: 0.27.0.rc1
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 0.26.5
40
+ version: 0.27.0.rc1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: decidim-core
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - '='
46
46
  - !ruby/object:Gem::Version
47
- version: 0.26.5
47
+ version: 0.27.0.rc1
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - '='
53
53
  - !ruby/object:Gem::Version
54
- version: 0.26.5
54
+ version: 0.27.0.rc1
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: decidim-dev
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - '='
60
60
  - !ruby/object:Gem::Version
61
- version: 0.26.5
61
+ version: 0.27.0.rc1
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - '='
67
67
  - !ruby/object:Gem::Version
68
- version: 0.26.5
68
+ version: 0.27.0.rc1
69
69
  description: Extends Decidim adding a first level public consultation component
70
70
  email:
71
71
  - jsperezg@gmail.com
@@ -182,7 +182,6 @@ files:
182
182
  - app/queries/decidim/consultations/organization_active_consultations.rb
183
183
  - app/queries/decidim/consultations/organization_consultations.rb
184
184
  - app/queries/decidim/consultations/organization_questions.rb
185
- - app/services/decidim/consultations/consultation_search.rb
186
185
  - app/views/decidim/consultations/_consultation.html.erb
187
186
  - app/views/decidim/consultations/admin/consultations/_form.html.erb
188
187
  - app/views/decidim/consultations/admin/consultations/edit.html.erb
@@ -273,7 +272,6 @@ files:
273
272
  - config/locales/fr.yml
274
273
  - config/locales/ga-IE.yml
275
274
  - config/locales/gl.yml
276
- - config/locales/gn-PY.yml
277
275
  - config/locales/hr-HR.yml
278
276
  - config/locales/hr.yml
279
277
  - config/locales/hu.yml
@@ -282,12 +280,10 @@ files:
282
280
  - config/locales/is.yml
283
281
  - config/locales/it.yml
284
282
  - config/locales/ja.yml
285
- - config/locales/ka-GE.yml
286
283
  - config/locales/ko-KR.yml
287
284
  - config/locales/ko.yml
288
285
  - config/locales/lb-LU.yml
289
286
  - config/locales/lb.yml
290
- - config/locales/lo-LA.yml
291
287
  - config/locales/lt-LT.yml
292
288
  - config/locales/lt.yml
293
289
  - config/locales/lv.yml
@@ -295,7 +291,6 @@ files:
295
291
  - config/locales/mt.yml
296
292
  - config/locales/nl.yml
297
293
  - config/locales/no.yml
298
- - config/locales/oc-FR.yml
299
294
  - config/locales/om-ET.yml
300
295
  - config/locales/pl.yml
301
296
  - config/locales/pt-BR.yml
@@ -381,14 +376,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
381
376
  requirements:
382
377
  - - ">="
383
378
  - !ruby/object:Gem::Version
384
- version: '2.7'
379
+ version: '3.0'
385
380
  required_rubygems_version: !ruby/object:Gem::Requirement
386
381
  requirements:
387
- - - ">="
382
+ - - ">"
388
383
  - !ruby/object:Gem::Version
389
- version: '0'
384
+ version: 1.3.1
390
385
  requirements: []
391
- rubygems_version: 3.1.6
386
+ rubygems_version: 3.2.22
392
387
  signing_key:
393
388
  specification_version: 4
394
389
  summary: Decidim consultations module
data/app/services/decidim/consultations/consultation_search.rb DELETED
@@ -1,51 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Decidim
4
- module Consultations
5
- # Service that encapsulates all logic related to filtering consultations.
6
- class ConsultationSearch < Searchlight::Search
7
- # Public: Initializes the service.
8
- # page - The page number to paginate the results.
9
- # per_page - The number of proposals to return per page.
10
- def initialize(options = {})
11
- super(options)
12
- end
13
-
14
- def base_query
15
- Decidim::Consultation.where(organization: options[:organization]).published
16
- end
17
-
18
- # Handle the search_text filter
19
- def search_search_text
20
- query
21
- .where(Arel.sql("title->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
22
- .or(
23
- query.where(Arel.sql("description->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
24
- )
25
- .or(
26
- query.where(Arel.sql("subtitle->>'#{current_locale}' ILIKE ?").to_s, "%#{search_text}%")
27
- )
28
- end
29
-
30
- # Handle the state filter
31
- def search_state
32
- case state
33
- when "active"
34
- query.active
35
- when "upcoming"
36
- query.upcoming
37
- when "finished"
38
- query.finished
39
- else # Assume all
40
- query
41
- end
42
- end
43
-
44
- private
45
-
46
- def current_locale
47
- I18n.locale.to_s
48
- end
49
- end
50
- end
51
- end
data/config/locales/gn-PY.yml DELETED
@@ -1 +0,0 @@
1
- gn:
data/config/locales/ka-GE.yml DELETED
@@ -1 +0,0 @@
1
- ka:
data/config/locales/lo-LA.yml DELETED
@@ -1 +0,0 @@
1
- lo:
data/config/locales/oc-FR.yml DELETED
@@ -1 +0,0 @@
1
- oc: