decidim-reporting_proposals 0.6.0 → 0.6.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +90 -93
- data/app/controllers/concerns/decidim/reporting_proposals/admin/proposal_answer_templates_controller_override.rb +0 -17
- data/app/overrides/decidim/proposals/admin/proposals/_proposal-tr/add_valuators_name.html.erb.deface +2 -2
- data/lib/decidim/reporting_proposals/version.rb +3 -3
- data/package-lock.json +27 -19
- data/package.json +5 -5
- metadata +22 -23
- data/app/permissions/decidim/templates/admin/permissions.rb +0 -51
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 25434ac2e58de3ba02fcbd5c627ce6f3e890488306eda80ec8ce1abf8f8ba8d0
|
4
|
+
data.tar.gz: 6cd83c0413e17a0b4a5edab0435cd91162c777ac47e7b5c33eac4977f9d72727
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 274e66c0eee7067c6c78adb1426b82fafecd56bf832f777c5cc41151cafd6c88a4bea24370d838179522dfbbf195f7552571d7f06f7f5ca5029bc22874058f6a
|
7
|
+
data.tar.gz: b281959258bc91b840a38075a98f9d615ff00aa604d643e454e5cedac84abaeee00a41c20669e4ca97441bc9e61b3932fed2fa3bf413fc079edfb0b0f6ad4e69
|
data/Gemfile.lock
CHANGED
@@ -1,11 +1,11 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
decidim-reporting_proposals (0.6.
|
5
|
-
decidim-admin (>= 0.28, < 0.29)
|
6
|
-
decidim-core (>= 0.28, < 0.29)
|
7
|
-
decidim-participatory_processes (>= 0.28, < 0.29)
|
8
|
-
decidim-proposals (>= 0.28, < 0.29)
|
4
|
+
decidim-reporting_proposals (0.6.1)
|
5
|
+
decidim-admin (>= 0.28.1, < 0.29)
|
6
|
+
decidim-core (>= 0.28.1, < 0.29)
|
7
|
+
decidim-participatory_processes (>= 0.28.1, < 0.29)
|
8
|
+
decidim-proposals (>= 0.28.1, < 0.29)
|
9
9
|
deface (>= 1.9)
|
10
10
|
|
11
11
|
GEM
|
@@ -143,60 +143,61 @@ GEM
|
|
143
143
|
date_validator (0.12.0)
|
144
144
|
activemodel (>= 3)
|
145
145
|
activesupport (>= 3)
|
146
|
-
decidim (0.28.
|
147
|
-
decidim-accountability (= 0.28.
|
148
|
-
decidim-admin (= 0.28.
|
149
|
-
decidim-api (= 0.28.
|
150
|
-
decidim-assemblies (= 0.28.
|
151
|
-
decidim-blogs (= 0.28.
|
152
|
-
decidim-budgets (= 0.28.
|
153
|
-
decidim-comments (= 0.28.
|
154
|
-
decidim-core (= 0.28.
|
155
|
-
decidim-debates (= 0.28.
|
156
|
-
decidim-forms (= 0.28.
|
157
|
-
decidim-generators (= 0.28.
|
158
|
-
decidim-meetings (= 0.28.
|
159
|
-
decidim-pages (= 0.28.
|
160
|
-
decidim-participatory_processes (= 0.28.
|
161
|
-
decidim-proposals (= 0.28.
|
162
|
-
decidim-sortitions (= 0.28.
|
163
|
-
decidim-surveys (= 0.28.
|
164
|
-
decidim-system (= 0.28.
|
165
|
-
decidim-templates (= 0.28.
|
166
|
-
decidim-verifications (= 0.28.
|
167
|
-
decidim-accountability (0.28.
|
168
|
-
decidim-comments (= 0.28.
|
169
|
-
decidim-core (= 0.28.
|
170
|
-
decidim-admin (0.28.
|
146
|
+
decidim (0.28.1)
|
147
|
+
decidim-accountability (= 0.28.1)
|
148
|
+
decidim-admin (= 0.28.1)
|
149
|
+
decidim-api (= 0.28.1)
|
150
|
+
decidim-assemblies (= 0.28.1)
|
151
|
+
decidim-blogs (= 0.28.1)
|
152
|
+
decidim-budgets (= 0.28.1)
|
153
|
+
decidim-comments (= 0.28.1)
|
154
|
+
decidim-core (= 0.28.1)
|
155
|
+
decidim-debates (= 0.28.1)
|
156
|
+
decidim-forms (= 0.28.1)
|
157
|
+
decidim-generators (= 0.28.1)
|
158
|
+
decidim-meetings (= 0.28.1)
|
159
|
+
decidim-pages (= 0.28.1)
|
160
|
+
decidim-participatory_processes (= 0.28.1)
|
161
|
+
decidim-proposals (= 0.28.1)
|
162
|
+
decidim-sortitions (= 0.28.1)
|
163
|
+
decidim-surveys (= 0.28.1)
|
164
|
+
decidim-system (= 0.28.1)
|
165
|
+
decidim-templates (= 0.28.1)
|
166
|
+
decidim-verifications (= 0.28.1)
|
167
|
+
decidim-accountability (0.28.1)
|
168
|
+
decidim-comments (= 0.28.1)
|
169
|
+
decidim-core (= 0.28.1)
|
170
|
+
decidim-admin (0.28.1)
|
171
171
|
active_link_to (~> 1.0)
|
172
|
-
decidim-core (= 0.28.
|
172
|
+
decidim-core (= 0.28.1)
|
173
173
|
devise (~> 4.7)
|
174
174
|
devise-i18n (~> 1.2)
|
175
175
|
devise_invitable (~> 2.0, >= 2.0.9)
|
176
|
-
decidim-api (0.28.
|
176
|
+
decidim-api (0.28.1)
|
177
177
|
commonmarker (~> 0.23.0, >= 0.23.9)
|
178
|
+
decidim-core (= 0.28.1)
|
178
179
|
graphql (~> 2.0.0)
|
179
180
|
graphql-docs (~> 3.0.1)
|
180
181
|
rack-cors (~> 1.0)
|
181
|
-
decidim-assemblies (0.28.
|
182
|
-
decidim-core (= 0.28.
|
183
|
-
decidim-blogs (0.28.
|
184
|
-
decidim-admin (= 0.28.
|
185
|
-
decidim-comments (= 0.28.
|
186
|
-
decidim-core (= 0.28.
|
187
|
-
decidim-budgets (0.28.
|
188
|
-
decidim-comments (= 0.28.
|
189
|
-
decidim-core (= 0.28.
|
182
|
+
decidim-assemblies (0.28.1)
|
183
|
+
decidim-core (= 0.28.1)
|
184
|
+
decidim-blogs (0.28.1)
|
185
|
+
decidim-admin (= 0.28.1)
|
186
|
+
decidim-comments (= 0.28.1)
|
187
|
+
decidim-core (= 0.28.1)
|
188
|
+
decidim-budgets (0.28.1)
|
189
|
+
decidim-comments (= 0.28.1)
|
190
|
+
decidim-core (= 0.28.1)
|
190
191
|
decidim-bulletin_board (0.24.4)
|
191
192
|
byebug (~> 11.0)
|
192
193
|
graphlient (~> 0.5.0)
|
193
194
|
jwt (~> 2.5.0)
|
194
195
|
rails (>= 5.0.0, < 7.1)
|
195
196
|
wisper (~> 2.0.0)
|
196
|
-
decidim-comments (0.28.
|
197
|
-
decidim-core (= 0.28.
|
197
|
+
decidim-comments (0.28.1)
|
198
|
+
decidim-core (= 0.28.1)
|
198
199
|
redcarpet (~> 3.5, >= 3.5.1)
|
199
|
-
decidim-core (0.28.
|
200
|
+
decidim-core (0.28.1)
|
200
201
|
active_link_to (~> 1.0)
|
201
202
|
acts_as_list (~> 1.0)
|
202
203
|
batch-loader (~> 1.2)
|
@@ -206,7 +207,6 @@ GEM
|
|
206
207
|
cells-rails (~> 0.1.3)
|
207
208
|
charlock_holmes (~> 0.7)
|
208
209
|
date_validator (~> 0.12.0)
|
209
|
-
decidim-api (= 0.28.0)
|
210
210
|
devise (~> 4.7)
|
211
211
|
devise-i18n (~> 1.2, < 1.11.1)
|
212
212
|
diffy (~> 3.3)
|
@@ -222,7 +222,6 @@ GEM
|
|
222
222
|
loofah (~> 2.19, >= 2.19.1)
|
223
223
|
mime-types (>= 1.16, < 4.0)
|
224
224
|
mini_magick (~> 4.9)
|
225
|
-
mustache (~> 1.1.0)
|
226
225
|
net-smtp (~> 0.3.1)
|
227
226
|
omniauth (~> 2.0)
|
228
227
|
omniauth-facebook (~> 5.0)
|
@@ -248,14 +247,14 @@ GEM
|
|
248
247
|
valid_email2 (~> 4.0)
|
249
248
|
web-push (~> 3.0)
|
250
249
|
wisper (~> 2.0)
|
251
|
-
decidim-debates (0.28.
|
252
|
-
decidim-comments (= 0.28.
|
253
|
-
decidim-core (= 0.28.
|
254
|
-
decidim-dev (0.28.
|
250
|
+
decidim-debates (0.28.1)
|
251
|
+
decidim-comments (= 0.28.1)
|
252
|
+
decidim-core (= 0.28.1)
|
253
|
+
decidim-dev (0.28.1)
|
255
254
|
bullet (~> 7.0)
|
256
255
|
byebug (~> 11.0)
|
257
256
|
capybara (~> 3.39)
|
258
|
-
decidim (= 0.28.
|
257
|
+
decidim (= 0.28.1)
|
259
258
|
erb_lint (~> 0.4.0)
|
260
259
|
factory_bot_rails (~> 6.2)
|
261
260
|
faker (~> 3.2)
|
@@ -280,53 +279,52 @@ GEM
|
|
280
279
|
w3c_rspec_validators (~> 0.3.0)
|
281
280
|
webmock (~> 3.18)
|
282
281
|
wisper-rspec (~> 1.0)
|
283
|
-
decidim-elections (0.28.
|
282
|
+
decidim-elections (0.28.1)
|
284
283
|
decidim-bulletin_board (~> 0.24.4)
|
285
|
-
decidim-core (= 0.28.
|
286
|
-
decidim-forms (= 0.28.
|
287
|
-
decidim-proposals (= 0.28.
|
284
|
+
decidim-core (= 0.28.1)
|
285
|
+
decidim-forms (= 0.28.1)
|
286
|
+
decidim-proposals (= 0.28.1)
|
288
287
|
rack-attack (~> 6.0)
|
289
288
|
voting_schemes-dummy (~> 0.24.4)
|
290
289
|
voting_schemes-electionguard (~> 0.24.4)
|
291
|
-
decidim-forms (0.28.
|
292
|
-
decidim-core (= 0.28.
|
290
|
+
decidim-forms (0.28.1)
|
291
|
+
decidim-core (= 0.28.1)
|
293
292
|
wicked_pdf (~> 2.1)
|
294
293
|
wkhtmltopdf-binary (~> 0.12)
|
295
|
-
decidim-generators (0.28.
|
296
|
-
decidim-core (= 0.28.
|
297
|
-
decidim-meetings (0.28.
|
298
|
-
decidim-core (= 0.28.
|
299
|
-
decidim-forms (= 0.28.
|
294
|
+
decidim-generators (0.28.1)
|
295
|
+
decidim-core (= 0.28.1)
|
296
|
+
decidim-meetings (0.28.1)
|
297
|
+
decidim-core (= 0.28.1)
|
298
|
+
decidim-forms (= 0.28.1)
|
300
299
|
icalendar (~> 2.5)
|
301
|
-
decidim-pages (0.28.
|
302
|
-
decidim-core (= 0.28.
|
303
|
-
decidim-participatory_processes (0.28.
|
304
|
-
decidim-core (= 0.28.
|
305
|
-
decidim-proposals (0.28.
|
306
|
-
decidim-comments (= 0.28.
|
307
|
-
decidim-core (= 0.28.
|
300
|
+
decidim-pages (0.28.1)
|
301
|
+
decidim-core (= 0.28.1)
|
302
|
+
decidim-participatory_processes (0.28.1)
|
303
|
+
decidim-core (= 0.28.1)
|
304
|
+
decidim-proposals (0.28.1)
|
305
|
+
decidim-comments (= 0.28.1)
|
306
|
+
decidim-core (= 0.28.1)
|
308
307
|
doc2text (~> 0.4.6)
|
309
308
|
redcarpet (~> 3.5, >= 3.5.1)
|
310
|
-
decidim-sortitions (0.28.
|
311
|
-
decidim-admin (= 0.28.
|
312
|
-
decidim-comments (= 0.28.
|
313
|
-
decidim-core (= 0.28.
|
314
|
-
decidim-proposals (= 0.28.
|
315
|
-
decidim-surveys (0.28.
|
316
|
-
decidim-core (= 0.28.
|
317
|
-
decidim-forms (= 0.28.
|
318
|
-
|
319
|
-
decidim-system (0.28.0)
|
309
|
+
decidim-sortitions (0.28.1)
|
310
|
+
decidim-admin (= 0.28.1)
|
311
|
+
decidim-comments (= 0.28.1)
|
312
|
+
decidim-core (= 0.28.1)
|
313
|
+
decidim-proposals (= 0.28.1)
|
314
|
+
decidim-surveys (0.28.1)
|
315
|
+
decidim-core (= 0.28.1)
|
316
|
+
decidim-forms (= 0.28.1)
|
317
|
+
decidim-system (0.28.1)
|
320
318
|
active_link_to (~> 1.0)
|
321
|
-
decidim-core (= 0.28.
|
319
|
+
decidim-core (= 0.28.1)
|
322
320
|
devise (~> 4.7)
|
323
321
|
devise-i18n (~> 1.2)
|
324
322
|
devise_invitable (~> 2.0, >= 2.0.9)
|
325
|
-
decidim-templates (0.28.
|
326
|
-
decidim-core (= 0.28.
|
327
|
-
decidim-forms (= 0.28.
|
328
|
-
decidim-verifications (0.28.
|
329
|
-
decidim-core (= 0.28.
|
323
|
+
decidim-templates (0.28.1)
|
324
|
+
decidim-core (= 0.28.1)
|
325
|
+
decidim-forms (= 0.28.1)
|
326
|
+
decidim-verifications (0.28.1)
|
327
|
+
decidim-core (= 0.28.1)
|
330
328
|
declarative-builder (0.1.0)
|
331
329
|
declarative-option (< 0.2.0)
|
332
330
|
declarative-option (0.1.0)
|
@@ -515,7 +513,6 @@ GEM
|
|
515
513
|
msgpack (1.7.2)
|
516
514
|
multi_xml (0.6.0)
|
517
515
|
multipart-post (2.4.0)
|
518
|
-
mustache (1.1.1)
|
519
516
|
net-imap (0.4.10)
|
520
517
|
date
|
521
518
|
net-protocol
|
@@ -574,7 +571,7 @@ GEM
|
|
574
571
|
activerecord (>= 5.2)
|
575
572
|
request_store (~> 1.1)
|
576
573
|
parallel (1.24.0)
|
577
|
-
parallel_tests (4.
|
574
|
+
parallel_tests (4.7.1)
|
578
575
|
parallel
|
579
576
|
parser (3.3.0.5)
|
580
577
|
ast (~> 2.4.1)
|
@@ -718,7 +715,7 @@ GEM
|
|
718
715
|
rack (>= 1.1)
|
719
716
|
rubocop (>= 1.33.0, < 2.0)
|
720
717
|
rubocop-ast (>= 1.31.1, < 2.0)
|
721
|
-
rubocop-rspec (2.29.
|
718
|
+
rubocop-rspec (2.29.2)
|
722
719
|
rubocop (~> 1.40)
|
723
720
|
rubocop-capybara (~> 2.17)
|
724
721
|
rubocop-factory_bot (~> 2.22)
|
@@ -738,7 +735,7 @@ GEM
|
|
738
735
|
sass-listen (4.0.0)
|
739
736
|
rb-fsevent (~> 0.9, >= 0.9.4)
|
740
737
|
rb-inotify (~> 0.9, >= 0.9.7)
|
741
|
-
selenium-webdriver (4.
|
738
|
+
selenium-webdriver (4.20.1)
|
742
739
|
base64 (~> 0.2)
|
743
740
|
rexml (~> 3.2, >= 3.2.5)
|
744
741
|
rubyzip (>= 1.2.2, < 3.0)
|
@@ -839,11 +836,11 @@ DEPENDENCIES
|
|
839
836
|
bootsnap (~> 1.7)
|
840
837
|
byebug (~> 11.0)
|
841
838
|
codecov
|
842
|
-
decidim (= 0.28)
|
843
|
-
decidim-dev (= 0.28)
|
844
|
-
decidim-elections (= 0.28)
|
839
|
+
decidim (= 0.28.1)
|
840
|
+
decidim-dev (= 0.28.1)
|
841
|
+
decidim-elections (= 0.28.1)
|
845
842
|
decidim-reporting_proposals!
|
846
|
-
decidim-templates (= 0.28)
|
843
|
+
decidim-templates (= 0.28.1)
|
847
844
|
faker (~> 3.2)
|
848
845
|
letter_opener_web
|
849
846
|
listen (~> 3.1)
|
@@ -20,23 +20,6 @@ module Decidim
|
|
20
20
|
@avaliablity_options.prepend [t("global_scope", scope: "decidim.templates.admin.proposal_answer_templates.index"), 0]
|
21
21
|
end
|
22
22
|
|
23
|
-
# This is overriden because a bug in decidim templates that prevents valuators to use templates
|
24
|
-
# This can be removed after https://github.com/decidim/decidim/pull/12765 is merge & backported
|
25
|
-
def fetch
|
26
|
-
enforce_permission_to(:read, :template, template:, proposal:)
|
27
|
-
|
28
|
-
response_object = {
|
29
|
-
state: template.field_values["internal_state"],
|
30
|
-
template: populate_template_interpolations(proposal)
|
31
|
-
}
|
32
|
-
|
33
|
-
respond_to do |format|
|
34
|
-
format.json do
|
35
|
-
render json: response_object.to_json
|
36
|
-
end
|
37
|
-
end
|
38
|
-
end
|
39
|
-
|
40
23
|
private
|
41
24
|
|
42
25
|
def accepted_components
|
data/app/overrides/decidim/proposals/admin/proposals/_proposal-tr/add_valuators_name.html.erb.deface
CHANGED
@@ -1,6 +1,6 @@
|
|
1
|
-
<!-- replace "erb[loud]:contains('proposal.valuation_assignments.
|
1
|
+
<!-- replace "erb[loud]:contains('proposal.valuation_assignments.size')" -->
|
2
2
|
|
3
|
-
<% count = proposal.valuation_assignments.
|
3
|
+
<% count = proposal.valuation_assignments.size %>
|
4
4
|
<% if count.zero? %>
|
5
5
|
0
|
6
6
|
<% else %>
|
@@ -2,8 +2,8 @@
|
|
2
2
|
|
3
3
|
module Decidim
|
4
4
|
module ReportingProposals
|
5
|
-
VERSION = "0.6.
|
6
|
-
DECIDIM_VERSION = "0.28"
|
7
|
-
COMPAT_DECIDIM_VERSION = [">= 0.28", "< 0.29"].freeze
|
5
|
+
VERSION = "0.6.1"
|
6
|
+
DECIDIM_VERSION = "0.28.1"
|
7
|
+
COMPAT_DECIDIM_VERSION = [">= 0.28.1", "< 0.29"].freeze
|
8
8
|
end
|
9
9
|
end
|
data/package-lock.json
CHANGED
@@ -1,18 +1,18 @@
|
|
1
1
|
{
|
2
2
|
"name": "decidim_module_reporting_proposals",
|
3
|
-
"version": "0.6",
|
3
|
+
"version": "0.6.1",
|
4
4
|
"lockfileVersion": 3,
|
5
5
|
"requires": true,
|
6
6
|
"packages": {
|
7
7
|
"": {
|
8
8
|
"name": "decidim_module_reporting_proposals",
|
9
|
-
"version": "0.6",
|
9
|
+
"version": "0.6.1",
|
10
10
|
"license": "AGPL-3.0-or-later",
|
11
11
|
"devDependencies": {
|
12
|
-
"@decidim/dev": "0.28.
|
13
|
-
"@decidim/eslint-config": "0.28.
|
14
|
-
"@decidim/prettier-config": "0.28.
|
15
|
-
"@decidim/stylelint-config": "0.28.
|
12
|
+
"@decidim/dev": "0.28.1",
|
13
|
+
"@decidim/eslint-config": "0.28.1",
|
14
|
+
"@decidim/prettier-config": "0.28.1",
|
15
|
+
"@decidim/stylelint-config": "0.28.1",
|
16
16
|
"postcss-scss": "^4.0.9",
|
17
17
|
"sass-embedded": "~1.57.1"
|
18
18
|
},
|
@@ -243,20 +243,20 @@
|
|
243
243
|
}
|
244
244
|
},
|
245
245
|
"node_modules/@decidim/dev": {
|
246
|
-
"version": "0.28.
|
247
|
-
"resolved": "https://registry.npmjs.org/@decidim/dev/-/dev-0.28.
|
248
|
-
"integrity": "sha512-
|
246
|
+
"version": "0.28.1",
|
247
|
+
"resolved": "https://registry.npmjs.org/@decidim/dev/-/dev-0.28.1.tgz",
|
248
|
+
"integrity": "sha512-s3TwpmhZLwXXzafg7NoFxNoWUgPEEC9exH3fye+gx8PcPWAFcAlebgsONG8/TB0R3ikDcfI8fy6IHt4baVVpdg==",
|
249
249
|
"dev": true,
|
250
250
|
"dependencies": {
|
251
|
-
"@linthtml/linthtml": "^0.9.
|
251
|
+
"@linthtml/linthtml": "^0.9.6",
|
252
252
|
"axe-core": "^4.7.2",
|
253
253
|
"markdownlint-cli": "^0.35.0"
|
254
254
|
}
|
255
255
|
},
|
256
256
|
"node_modules/@decidim/eslint-config": {
|
257
|
-
"version": "0.28.
|
258
|
-
"resolved": "https://registry.npmjs.org/@decidim/eslint-config/-/eslint-config-0.28.
|
259
|
-
"integrity": "sha512-
|
257
|
+
"version": "0.28.1",
|
258
|
+
"resolved": "https://registry.npmjs.org/@decidim/eslint-config/-/eslint-config-0.28.1.tgz",
|
259
|
+
"integrity": "sha512-5HmLnR3+6JOYssOGqLHYmsfsk9MBX8LP3MXcsLjkCw3Rk9toHFHrRPj6mwwEAxLHFlO3QsJel/hLHpP9cHcVgA==",
|
260
260
|
"dev": true,
|
261
261
|
"peerDependencies": {
|
262
262
|
"eslint": "^8.7.0",
|
@@ -265,24 +265,25 @@
|
|
265
265
|
"eslint-config-standard": "^17.0.0",
|
266
266
|
"eslint-plugin-import": "^2.27.5",
|
267
267
|
"eslint-plugin-jsx-a11y": "^6.7.1",
|
268
|
+
"eslint-plugin-no-relative-import-paths": "^1.5.3",
|
268
269
|
"eslint-plugin-node": "^11.1.0",
|
269
270
|
"eslint-plugin-promise": "^6.1.1",
|
270
271
|
"eslint-plugin-react": "^7.32.2"
|
271
272
|
}
|
272
273
|
},
|
273
274
|
"node_modules/@decidim/prettier-config": {
|
274
|
-
"version": "0.28.
|
275
|
-
"resolved": "https://registry.npmjs.org/@decidim/prettier-config/-/prettier-config-0.28.
|
276
|
-
"integrity": "sha512-
|
275
|
+
"version": "0.28.1",
|
276
|
+
"resolved": "https://registry.npmjs.org/@decidim/prettier-config/-/prettier-config-0.28.1.tgz",
|
277
|
+
"integrity": "sha512-fmjs6hcWkcm+9BmFlDCDCAzBXeFn/1J8vlmgSFcoEZyukM3rE4NQIS2AsypP2CcuA3st9Ybn0uf1Mrx9u+rHdA==",
|
277
278
|
"dev": true,
|
278
279
|
"peerDependencies": {
|
279
280
|
"prettier": "^2.3.2"
|
280
281
|
}
|
281
282
|
},
|
282
283
|
"node_modules/@decidim/stylelint-config": {
|
283
|
-
"version": "0.28.
|
284
|
-
"resolved": "https://registry.npmjs.org/@decidim/stylelint-config/-/stylelint-config-0.28.
|
285
|
-
"integrity": "sha512-
|
284
|
+
"version": "0.28.1",
|
285
|
+
"resolved": "https://registry.npmjs.org/@decidim/stylelint-config/-/stylelint-config-0.28.1.tgz",
|
286
|
+
"integrity": "sha512-AT+NsVMA0DZOKuFse9tTYDfV5En4wwNZ6txbLGZh8VE5EDk1v2yr7eVdi+Y7CA3LHbzW1q7SbFr5SRfdMxhntw==",
|
286
287
|
"dev": true,
|
287
288
|
"peerDependencies": {
|
288
289
|
"stylelint": "^15.3.0",
|
@@ -2251,6 +2252,13 @@
|
|
2251
2252
|
"eslint": ">=7.0.0"
|
2252
2253
|
}
|
2253
2254
|
},
|
2255
|
+
"node_modules/eslint-plugin-no-relative-import-paths": {
|
2256
|
+
"version": "1.5.4",
|
2257
|
+
"resolved": "https://registry.npmjs.org/eslint-plugin-no-relative-import-paths/-/eslint-plugin-no-relative-import-paths-1.5.4.tgz",
|
2258
|
+
"integrity": "sha512-2smViH7R3682NR6dwgYr8Vm7emqNP1gEjBku6DbvUy3Ef/2Fz+mhwsFjZGSixzWzazMCj4MAgIWTsHELCCDJKA==",
|
2259
|
+
"dev": true,
|
2260
|
+
"peer": true
|
2261
|
+
},
|
2254
2262
|
"node_modules/eslint-plugin-node": {
|
2255
2263
|
"version": "11.1.0",
|
2256
2264
|
"resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
|
data/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "decidim_module_reporting_proposals",
|
3
|
-
"version": "0.6",
|
3
|
+
"version": "0.6.1",
|
4
4
|
"description": "A 3 steps proposals for Decidim",
|
5
5
|
"scripts": {
|
6
6
|
"test": "echo \"Error: no test specified\" && exit 1",
|
@@ -31,10 +31,10 @@
|
|
31
31
|
},
|
32
32
|
"prettier": "@decidim/prettier-config",
|
33
33
|
"devDependencies": {
|
34
|
-
"@decidim/dev": "0.28.
|
35
|
-
"@decidim/eslint-config": "0.28.
|
36
|
-
"@decidim/prettier-config": "0.28.
|
37
|
-
"@decidim/stylelint-config": "0.28.
|
34
|
+
"@decidim/dev": "0.28.1",
|
35
|
+
"@decidim/eslint-config": "0.28.1",
|
36
|
+
"@decidim/prettier-config": "0.28.1",
|
37
|
+
"@decidim/stylelint-config": "0.28.1",
|
38
38
|
"postcss-scss": "^4.0.9",
|
39
39
|
"sass-embedded": "~1.57.1"
|
40
40
|
}
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: decidim-reporting_proposals
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.6.
|
4
|
+
version: 0.6.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ivan Vergés
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2024-05-
|
11
|
+
date: 2024-05-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: decidim-admin
|
@@ -16,7 +16,7 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version:
|
19
|
+
version: 0.28.1
|
20
20
|
- - "<"
|
21
21
|
- !ruby/object:Gem::Version
|
22
22
|
version: '0.29'
|
@@ -26,7 +26,7 @@ dependencies:
|
|
26
26
|
requirements:
|
27
27
|
- - ">="
|
28
28
|
- !ruby/object:Gem::Version
|
29
|
-
version:
|
29
|
+
version: 0.28.1
|
30
30
|
- - "<"
|
31
31
|
- !ruby/object:Gem::Version
|
32
32
|
version: '0.29'
|
@@ -36,7 +36,7 @@ dependencies:
|
|
36
36
|
requirements:
|
37
37
|
- - ">="
|
38
38
|
- !ruby/object:Gem::Version
|
39
|
-
version:
|
39
|
+
version: 0.28.1
|
40
40
|
- - "<"
|
41
41
|
- !ruby/object:Gem::Version
|
42
42
|
version: '0.29'
|
@@ -46,7 +46,7 @@ dependencies:
|
|
46
46
|
requirements:
|
47
47
|
- - ">="
|
48
48
|
- !ruby/object:Gem::Version
|
49
|
-
version:
|
49
|
+
version: 0.28.1
|
50
50
|
- - "<"
|
51
51
|
- !ruby/object:Gem::Version
|
52
52
|
version: '0.29'
|
@@ -56,7 +56,7 @@ dependencies:
|
|
56
56
|
requirements:
|
57
57
|
- - ">="
|
58
58
|
- !ruby/object:Gem::Version
|
59
|
-
version:
|
59
|
+
version: 0.28.1
|
60
60
|
- - "<"
|
61
61
|
- !ruby/object:Gem::Version
|
62
62
|
version: '0.29'
|
@@ -66,7 +66,7 @@ dependencies:
|
|
66
66
|
requirements:
|
67
67
|
- - ">="
|
68
68
|
- !ruby/object:Gem::Version
|
69
|
-
version:
|
69
|
+
version: 0.28.1
|
70
70
|
- - "<"
|
71
71
|
- !ruby/object:Gem::Version
|
72
72
|
version: '0.29'
|
@@ -76,7 +76,7 @@ dependencies:
|
|
76
76
|
requirements:
|
77
77
|
- - ">="
|
78
78
|
- !ruby/object:Gem::Version
|
79
|
-
version:
|
79
|
+
version: 0.28.1
|
80
80
|
- - "<"
|
81
81
|
- !ruby/object:Gem::Version
|
82
82
|
version: '0.29'
|
@@ -86,7 +86,7 @@ dependencies:
|
|
86
86
|
requirements:
|
87
87
|
- - ">="
|
88
88
|
- !ruby/object:Gem::Version
|
89
|
-
version:
|
89
|
+
version: 0.28.1
|
90
90
|
- - "<"
|
91
91
|
- !ruby/object:Gem::Version
|
92
92
|
version: '0.29'
|
@@ -110,7 +110,7 @@ dependencies:
|
|
110
110
|
requirements:
|
111
111
|
- - ">="
|
112
112
|
- !ruby/object:Gem::Version
|
113
|
-
version:
|
113
|
+
version: 0.28.1
|
114
114
|
- - "<"
|
115
115
|
- !ruby/object:Gem::Version
|
116
116
|
version: '0.29'
|
@@ -120,7 +120,7 @@ dependencies:
|
|
120
120
|
requirements:
|
121
121
|
- - ">="
|
122
122
|
- !ruby/object:Gem::Version
|
123
|
-
version:
|
123
|
+
version: 0.28.1
|
124
124
|
- - "<"
|
125
125
|
- !ruby/object:Gem::Version
|
126
126
|
version: '0.29'
|
@@ -130,7 +130,7 @@ dependencies:
|
|
130
130
|
requirements:
|
131
131
|
- - ">="
|
132
132
|
- !ruby/object:Gem::Version
|
133
|
-
version:
|
133
|
+
version: 0.28.1
|
134
134
|
- - "<"
|
135
135
|
- !ruby/object:Gem::Version
|
136
136
|
version: '0.29'
|
@@ -140,7 +140,7 @@ dependencies:
|
|
140
140
|
requirements:
|
141
141
|
- - ">="
|
142
142
|
- !ruby/object:Gem::Version
|
143
|
-
version:
|
143
|
+
version: 0.28.1
|
144
144
|
- - "<"
|
145
145
|
- !ruby/object:Gem::Version
|
146
146
|
version: '0.29'
|
@@ -150,7 +150,7 @@ dependencies:
|
|
150
150
|
requirements:
|
151
151
|
- - ">="
|
152
152
|
- !ruby/object:Gem::Version
|
153
|
-
version:
|
153
|
+
version: 0.28.1
|
154
154
|
- - "<"
|
155
155
|
- !ruby/object:Gem::Version
|
156
156
|
version: '0.29'
|
@@ -160,7 +160,7 @@ dependencies:
|
|
160
160
|
requirements:
|
161
161
|
- - ">="
|
162
162
|
- !ruby/object:Gem::Version
|
163
|
-
version:
|
163
|
+
version: 0.28.1
|
164
164
|
- - "<"
|
165
165
|
- !ruby/object:Gem::Version
|
166
166
|
version: '0.29'
|
@@ -170,7 +170,7 @@ dependencies:
|
|
170
170
|
requirements:
|
171
171
|
- - ">="
|
172
172
|
- !ruby/object:Gem::Version
|
173
|
-
version:
|
173
|
+
version: 0.28.1
|
174
174
|
- - "<"
|
175
175
|
- !ruby/object:Gem::Version
|
176
176
|
version: '0.29'
|
@@ -180,7 +180,7 @@ dependencies:
|
|
180
180
|
requirements:
|
181
181
|
- - ">="
|
182
182
|
- !ruby/object:Gem::Version
|
183
|
-
version:
|
183
|
+
version: 0.28.1
|
184
184
|
- - "<"
|
185
185
|
- !ruby/object:Gem::Version
|
186
186
|
version: '0.29'
|
@@ -190,7 +190,7 @@ dependencies:
|
|
190
190
|
requirements:
|
191
191
|
- - ">="
|
192
192
|
- !ruby/object:Gem::Version
|
193
|
-
version:
|
193
|
+
version: 0.28.1
|
194
194
|
- - "<"
|
195
195
|
- !ruby/object:Gem::Version
|
196
196
|
version: '0.29'
|
@@ -200,7 +200,7 @@ dependencies:
|
|
200
200
|
requirements:
|
201
201
|
- - ">="
|
202
202
|
- !ruby/object:Gem::Version
|
203
|
-
version:
|
203
|
+
version: 0.28.1
|
204
204
|
- - "<"
|
205
205
|
- !ruby/object:Gem::Version
|
206
206
|
version: '0.29'
|
@@ -210,7 +210,7 @@ dependencies:
|
|
210
210
|
requirements:
|
211
211
|
- - ">="
|
212
212
|
- !ruby/object:Gem::Version
|
213
|
-
version:
|
213
|
+
version: 0.28.1
|
214
214
|
- - "<"
|
215
215
|
- !ruby/object:Gem::Version
|
216
216
|
version: '0.29'
|
@@ -220,7 +220,7 @@ dependencies:
|
|
220
220
|
requirements:
|
221
221
|
- - ">="
|
222
222
|
- !ruby/object:Gem::Version
|
223
|
-
version:
|
223
|
+
version: 0.28.1
|
224
224
|
- - "<"
|
225
225
|
- !ruby/object:Gem::Version
|
226
226
|
version: '0.29'
|
@@ -362,7 +362,6 @@ files:
|
|
362
362
|
- app/permissions/concerns/decidim/reporting_proposals/admin/permissions_override.rb
|
363
363
|
- app/permissions/decidim/reporting_proposals/admin/permissions.rb
|
364
364
|
- app/permissions/decidim/reporting_proposals/permissions.rb
|
365
|
-
- app/permissions/decidim/templates/admin/permissions.rb
|
366
365
|
- app/presenters/concerns/decidim/reporting_proposals/resource_locator_presenter_override.rb
|
367
366
|
- app/queries/decidim/reporting_proposals/nearby_proposals.rb
|
368
367
|
- app/resources/concerns/decidim/reporting_proposals/resource_manifest_override.rb
|
@@ -1,51 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Decidim
|
4
|
-
module Templates
|
5
|
-
module Admin
|
6
|
-
# this is here due a bug in Decidim 0.28 when they introduced proposal answer templates
|
7
|
-
# they didn't take into account that valuators can answer proposals
|
8
|
-
# This can be removed after https://github.com/decidim/decidim/pull/12765 is merge & backported
|
9
|
-
class Permissions < Decidim::DefaultPermissions
|
10
|
-
def permissions
|
11
|
-
return permission_action if permission_action.scope != :admin
|
12
|
-
return permission_action unless user
|
13
|
-
return permission_action if context[:current_organization] != user.organization
|
14
|
-
|
15
|
-
if user_has_a_role? && (permission_action.subject == :template && permission_action.action == :read)
|
16
|
-
allow!
|
17
|
-
else
|
18
|
-
return permission_action unless user.admin?
|
19
|
-
|
20
|
-
case permission_action.subject
|
21
|
-
when :template
|
22
|
-
allow! if [:read, :create, :update, :destroy, :copy].include? permission_action.action
|
23
|
-
when :templates
|
24
|
-
allow! if permission_action.action == :index
|
25
|
-
when :questionnaire
|
26
|
-
allow!
|
27
|
-
end
|
28
|
-
end
|
29
|
-
|
30
|
-
permission_action
|
31
|
-
end
|
32
|
-
|
33
|
-
private
|
34
|
-
|
35
|
-
def participatory_space
|
36
|
-
@participatory_space ||= context[:proposal].try(:participatory_space)
|
37
|
-
end
|
38
|
-
|
39
|
-
def user_roles
|
40
|
-
@user_roles ||= participatory_space.try(:user_roles)
|
41
|
-
end
|
42
|
-
|
43
|
-
def user_has_a_role?
|
44
|
-
return unless user_roles
|
45
|
-
|
46
|
-
user_roles.exists?(user:)
|
47
|
-
end
|
48
|
-
end
|
49
|
-
end
|
50
|
-
end
|
51
|
-
end
|