decidim-proposals 0.26.2 → 0.27.0.rc2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (120) hide show
  1. checksums.yaml +4 -4
  2. data/app/cells/decidim/proposals/highlighted_proposals_for_component_cell.rb +9 -1
  3. data/app/cells/decidim/proposals/proposal_m_cell.rb +5 -7
  4. data/app/commands/decidim/proposals/accept_access_to_collaborative_draft.rb +1 -1
  5. data/app/commands/decidim/proposals/admin/answer_proposal.rb +1 -1
  6. data/app/commands/decidim/proposals/admin/assign_proposals_to_valuator.rb +1 -1
  7. data/app/commands/decidim/proposals/admin/create_proposal.rb +8 -2
  8. data/app/commands/decidim/proposals/admin/create_proposal_note.rb +2 -2
  9. data/app/commands/decidim/proposals/admin/discard_participatory_text.rb +1 -1
  10. data/app/commands/decidim/proposals/admin/import_participatory_text.rb +1 -1
  11. data/app/commands/decidim/proposals/admin/import_proposals.rb +1 -1
  12. data/app/commands/decidim/proposals/admin/merge_proposals.rb +1 -1
  13. data/app/commands/decidim/proposals/admin/notify_proposal_answer.rb +1 -1
  14. data/app/commands/decidim/proposals/admin/publish_answers.rb +1 -1
  15. data/app/commands/decidim/proposals/admin/split_proposals.rb +1 -1
  16. data/app/commands/decidim/proposals/admin/unassign_proposals_from_valuator.rb +1 -1
  17. data/app/commands/decidim/proposals/admin/update_participatory_text.rb +1 -1
  18. data/app/commands/decidim/proposals/admin/update_proposal.rb +8 -2
  19. data/app/commands/decidim/proposals/admin/update_proposal_category.rb +5 -3
  20. data/app/commands/decidim/proposals/admin/update_proposal_scope.rb +3 -3
  21. data/app/commands/decidim/proposals/create_collaborative_draft.rb +5 -5
  22. data/app/commands/decidim/proposals/create_proposal.rb +1 -1
  23. data/app/commands/decidim/proposals/destroy_proposal.rb +1 -1
  24. data/app/commands/decidim/proposals/publish_collaborative_draft.rb +1 -1
  25. data/app/commands/decidim/proposals/publish_proposal.rb +1 -1
  26. data/app/commands/decidim/proposals/reject_access_to_collaborative_draft.rb +1 -1
  27. data/app/commands/decidim/proposals/request_access_to_collaborative_draft.rb +1 -1
  28. data/app/commands/decidim/proposals/unvote_proposal.rb +1 -1
  29. data/app/commands/decidim/proposals/update_collaborative_draft.rb +1 -1
  30. data/app/commands/decidim/proposals/update_proposal.rb +8 -2
  31. data/app/commands/decidim/proposals/vote_proposal.rb +1 -1
  32. data/app/commands/decidim/proposals/withdraw_collaborative_draft.rb +1 -1
  33. data/app/commands/decidim/proposals/withdraw_proposal.rb +1 -1
  34. data/app/controllers/concerns/decidim/proposals/orderable.rb +7 -5
  35. data/app/controllers/decidim/proposals/admin/proposals_controller.rb +7 -7
  36. data/app/controllers/decidim/proposals/collaborative_drafts_controller.rb +8 -8
  37. data/app/controllers/decidim/proposals/proposal_votes_controller.rb +1 -1
  38. data/app/controllers/decidim/proposals/proposals_controller.rb +24 -17
  39. data/app/events/decidim/proposals/publish_proposal_event.rb +8 -0
  40. data/app/forms/decidim/proposals/admin/import_participatory_text_form.rb +4 -4
  41. data/app/forms/decidim/proposals/admin/proposal_base_form.rb +4 -4
  42. data/app/forms/decidim/proposals/admin/proposal_form.rb +2 -0
  43. data/app/forms/decidim/proposals/admin/proposals_fork_form.rb +2 -2
  44. data/app/forms/decidim/proposals/admin/proposals_import_form.rb +1 -1
  45. data/app/forms/decidim/proposals/proposal_form.rb +11 -4
  46. data/app/forms/decidim/proposals/proposal_wizard_create_step_form.rb +3 -0
  47. data/app/helpers/decidim/proposals/admin/proposal_bulk_actions_helper.rb +4 -0
  48. data/app/helpers/decidim/proposals/application_helper.rb +4 -6
  49. data/app/helpers/decidim/proposals/proposal_cells_helper.rb +1 -3
  50. data/app/helpers/decidim/proposals/proposal_wizard_helper.rb +7 -7
  51. data/app/jobs/decidim/proposals/notify_proposals_mentioned_job.rb +1 -1
  52. data/app/models/decidim/proposals/collaborative_draft.rb +10 -0
  53. data/app/models/decidim/proposals/collaborative_draft_collaborator_request.rb +0 -2
  54. data/app/models/decidim/proposals/proposal.rb +47 -8
  55. data/app/queries/decidim/proposals/filtered_proposals.rb +1 -1
  56. data/app/queries/decidim/proposals/similar_proposals.rb +1 -1
  57. data/app/services/decidim/proposals/proposal_search.rb +16 -71
  58. data/app/views/decidim/proposals/admin/proposals/_form.html.erb +1 -1
  59. data/app/views/decidim/proposals/admin/proposals/publish_answers.js.erb +1 -1
  60. data/app/views/decidim/proposals/admin/proposals/update_attribute.js.erb +26 -0
  61. data/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb +8 -16
  62. data/app/views/decidim/proposals/collaborative_drafts/_filters.html.erb +4 -4
  63. data/app/views/decidim/proposals/collaborative_drafts/edit.html.erb +3 -1
  64. data/app/views/decidim/proposals/collaborative_drafts/new.html.erb +3 -1
  65. data/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb +13 -36
  66. data/app/views/decidim/proposals/proposals/_filters.html.erb +5 -5
  67. data/app/views/decidim/proposals/proposals/_proposals.html.erb +5 -5
  68. data/app/views/decidim/proposals/proposals/complete.html.erb +3 -1
  69. data/app/views/decidim/proposals/proposals/edit.html.erb +3 -1
  70. data/app/views/decidim/proposals/proposals/edit_draft.html.erb +3 -1
  71. data/app/views/decidim/proposals/proposals/new.html.erb +3 -1
  72. data/config/locales/ar.yml +1 -9
  73. data/config/locales/bg.yml +1 -4
  74. data/config/locales/ca.yml +13 -8
  75. data/config/locales/cs.yml +12 -7
  76. data/config/locales/de.yml +54 -6
  77. data/config/locales/el.yml +1 -6
  78. data/config/locales/en.yml +10 -6
  79. data/config/locales/es-MX.yml +12 -7
  80. data/config/locales/es-PY.yml +12 -7
  81. data/config/locales/es.yml +12 -7
  82. data/config/locales/eu.yml +1 -9
  83. data/config/locales/fi-plain.yml +11 -6
  84. data/config/locales/fi.yml +11 -6
  85. data/config/locales/fr-CA.yml +12 -6
  86. data/config/locales/fr.yml +12 -6
  87. data/config/locales/ga-IE.yml +1 -2
  88. data/config/locales/gl.yml +8 -9
  89. data/config/locales/hu.yml +8 -6
  90. data/config/locales/id-ID.yml +1 -5
  91. data/config/locales/is-IS.yml +2 -2
  92. data/config/locales/it.yml +2 -9
  93. data/config/locales/ja.yml +11 -6
  94. data/config/locales/lb.yml +1 -0
  95. data/config/locales/lt.yml +996 -0
  96. data/config/locales/lv.yml +1 -6
  97. data/config/locales/nl.yml +2 -9
  98. data/config/locales/no.yml +1 -6
  99. data/config/locales/pl.yml +1 -9
  100. data/config/locales/pt-BR.yml +1 -9
  101. data/config/locales/pt.yml +1 -9
  102. data/config/locales/ro-RO.yml +2 -9
  103. data/config/locales/ru.yml +1 -1
  104. data/config/locales/sk.yml +1 -6
  105. data/config/locales/sl.yml +1 -0
  106. data/config/locales/sr-CS.yml +1 -2
  107. data/config/locales/sv.yml +8 -12
  108. data/config/locales/tr-TR.yml +1 -9
  109. data/config/locales/uk.yml +1 -1
  110. data/config/locales/zh-CN.yml +1 -9
  111. data/db/migrate/20180529110230_move_authorships_to_coauthorships.rb +1 -0
  112. data/lib/decidim/proposals/component.rb +19 -14
  113. data/lib/decidim/proposals/import/proposal_answer_creator.rb +21 -19
  114. data/lib/decidim/proposals/test/factories.rb +1 -1
  115. data/lib/decidim/proposals/version.rb +1 -1
  116. metadata +25 -28
  117. data/app/services/decidim/proposals/collaborative_draft_search.rb +0 -59
  118. data/app/views/decidim/proposals/admin/proposals/_js-callout.html.erb +0 -6
  119. data/app/views/decidim/proposals/admin/proposals/update_category.js.erb +0 -26
  120. data/app/views/decidim/proposals/admin/proposals/update_scope.js.erb +0 -27
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decidim-proposals
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.26.2
4
+ version: 0.27.0.rc2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2022-06-14 00:00:00.000000000 Z
13
+ date: 2022-09-19 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: decidim-comments
@@ -18,42 +18,42 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 0.26.2
21
+ version: 0.27.0.rc2
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
26
  - - '='
27
27
  - !ruby/object:Gem::Version
28
- version: 0.26.2
28
+ version: 0.27.0.rc2
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: decidim-core
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
33
  - - '='
34
34
  - !ruby/object:Gem::Version
35
- version: 0.26.2
35
+ version: 0.27.0.rc2
36
36
  type: :runtime
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
40
  - - '='
41
41
  - !ruby/object:Gem::Version
42
- version: 0.26.2
42
+ version: 0.27.0.rc2
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: doc2text
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
47
  - - "~>"
48
48
  - !ruby/object:Gem::Version
49
- version: 0.4.4
49
+ version: 0.4.5
50
50
  type: :runtime
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
54
  - - "~>"
55
55
  - !ruby/object:Gem::Version
56
- version: 0.4.4
56
+ version: 0.4.5
57
57
  - !ruby/object:Gem::Dependency
58
58
  name: redcarpet
59
59
  requirement: !ruby/object:Gem::Requirement
@@ -80,84 +80,84 @@ dependencies:
80
80
  requirements:
81
81
  - - '='
82
82
  - !ruby/object:Gem::Version
83
- version: 0.26.2
83
+ version: 0.27.0.rc2
84
84
  type: :development
85
85
  prerelease: false
86
86
  version_requirements: !ruby/object:Gem::Requirement
87
87
  requirements:
88
88
  - - '='
89
89
  - !ruby/object:Gem::Version
90
- version: 0.26.2
90
+ version: 0.27.0.rc2
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: decidim-assemblies
93
93
  requirement: !ruby/object:Gem::Requirement
94
94
  requirements:
95
95
  - - '='
96
96
  - !ruby/object:Gem::Version
97
- version: 0.26.2
97
+ version: 0.27.0.rc2
98
98
  type: :development
99
99
  prerelease: false
100
100
  version_requirements: !ruby/object:Gem::Requirement
101
101
  requirements:
102
102
  - - '='
103
103
  - !ruby/object:Gem::Version
104
- version: 0.26.2
104
+ version: 0.27.0.rc2
105
105
  - !ruby/object:Gem::Dependency
106
106
  name: decidim-budgets
107
107
  requirement: !ruby/object:Gem::Requirement
108
108
  requirements:
109
109
  - - '='
110
110
  - !ruby/object:Gem::Version
111
- version: 0.26.2
111
+ version: 0.27.0.rc2
112
112
  type: :development
113
113
  prerelease: false
114
114
  version_requirements: !ruby/object:Gem::Requirement
115
115
  requirements:
116
116
  - - '='
117
117
  - !ruby/object:Gem::Version
118
- version: 0.26.2
118
+ version: 0.27.0.rc2
119
119
  - !ruby/object:Gem::Dependency
120
120
  name: decidim-dev
121
121
  requirement: !ruby/object:Gem::Requirement
122
122
  requirements:
123
123
  - - '='
124
124
  - !ruby/object:Gem::Version
125
- version: 0.26.2
125
+ version: 0.27.0.rc2
126
126
  type: :development
127
127
  prerelease: false
128
128
  version_requirements: !ruby/object:Gem::Requirement
129
129
  requirements:
130
130
  - - '='
131
131
  - !ruby/object:Gem::Version
132
- version: 0.26.2
132
+ version: 0.27.0.rc2
133
133
  - !ruby/object:Gem::Dependency
134
134
  name: decidim-meetings
135
135
  requirement: !ruby/object:Gem::Requirement
136
136
  requirements:
137
137
  - - '='
138
138
  - !ruby/object:Gem::Version
139
- version: 0.26.2
139
+ version: 0.27.0.rc2
140
140
  type: :development
141
141
  prerelease: false
142
142
  version_requirements: !ruby/object:Gem::Requirement
143
143
  requirements:
144
144
  - - '='
145
145
  - !ruby/object:Gem::Version
146
- version: 0.26.2
146
+ version: 0.27.0.rc2
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: decidim-participatory_processes
149
149
  requirement: !ruby/object:Gem::Requirement
150
150
  requirements:
151
151
  - - '='
152
152
  - !ruby/object:Gem::Version
153
- version: 0.26.2
153
+ version: 0.27.0.rc2
154
154
  type: :development
155
155
  prerelease: false
156
156
  version_requirements: !ruby/object:Gem::Requirement
157
157
  requirements:
158
158
  - - '='
159
159
  - !ruby/object:Gem::Version
160
- version: 0.26.2
160
+ version: 0.27.0.rc2
161
161
  description: A proposals component for decidim's participatory spaces.
162
162
  email:
163
163
  - josepjaume@gmail.com
@@ -361,7 +361,6 @@ files:
361
361
  - app/queries/decidim/proposals/metrics/proposals_metric_manage.rb
362
362
  - app/queries/decidim/proposals/metrics/votes_metric_manage.rb
363
363
  - app/queries/decidim/proposals/similar_proposals.rb
364
- - app/services/decidim/proposals/collaborative_draft_search.rb
365
364
  - app/services/decidim/proposals/diff_renderer.rb
366
365
  - app/services/decidim/proposals/proposal_builder.rb
367
366
  - app/services/decidim/proposals/proposal_search.rb
@@ -376,7 +375,6 @@ files:
376
375
  - app/views/decidim/proposals/admin/proposal_notes/_proposal_notes.html.erb
377
376
  - app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb
378
377
  - app/views/decidim/proposals/admin/proposals/_form.html.erb
379
- - app/views/decidim/proposals/admin/proposals/_js-callout.html.erb
380
378
  - app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb
381
379
  - app/views/decidim/proposals/admin/proposals/bulk_actions/_assign_to_valuator.html.erb
382
380
  - app/views/decidim/proposals/admin/proposals/bulk_actions/_dropdown.html.erb
@@ -391,8 +389,7 @@ files:
391
389
  - app/views/decidim/proposals/admin/proposals/new.html.erb
392
390
  - app/views/decidim/proposals/admin/proposals/publish_answers.js.erb
393
391
  - app/views/decidim/proposals/admin/proposals/show.html.erb
394
- - app/views/decidim/proposals/admin/proposals/update_category.js.erb
395
- - app/views/decidim/proposals/admin/proposals/update_scope.js.erb
392
+ - app/views/decidim/proposals/admin/proposals/update_attribute.js.erb
396
393
  - app/views/decidim/proposals/admin/proposals_imports/new.html.erb
397
394
  - app/views/decidim/proposals/collaborative_drafts/_accept_request_access_form.html.erb
398
395
  - app/views/decidim/proposals/collaborative_drafts/_collaborative_drafts.html.erb
@@ -613,14 +610,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
613
610
  requirements:
614
611
  - - ">="
615
612
  - !ruby/object:Gem::Version
616
- version: '2.7'
613
+ version: '3.0'
617
614
  required_rubygems_version: !ruby/object:Gem::Requirement
618
615
  requirements:
619
- - - ">="
616
+ - - ">"
620
617
  - !ruby/object:Gem::Version
621
- version: '0'
618
+ version: 1.3.1
622
619
  requirements: []
623
- rubygems_version: 3.1.6
620
+ rubygems_version: 3.2.22
624
621
  signing_key:
625
622
  specification_version: 4
626
623
  summary: Decidim proposals module
@@ -1,59 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Decidim
4
- module Proposals
5
- # A service to encapsualte all the logic when searching and filtering
6
- # collaborative drafts in a participatory process.
7
- class CollaborativeDraftSearch < ResourceSearch
8
- text_search_fields :title, :body
9
-
10
- # Public: Initializes the service.
11
- # component - A Decidim::Component to get the drafts from.
12
- # page - The page number to paginate the results.
13
- # per_page - The number of drafts to return per page.
14
- def initialize(options = {})
15
- super(CollaborativeDraft.all, options)
16
- end
17
-
18
- # Handle the search_text filter
19
- #
20
- # We can't use the search from `ResourceFilter` since these fields aren't
21
- # translated.
22
- def search_search_text
23
- query
24
- .where("title::text ILIKE ?", "%#{search_text}%")
25
- .or(query.where("body ILIKE ?", "%#{search_text}%"))
26
- end
27
-
28
- # Handle the state filter
29
- def search_state
30
- return query if state.member?("all")
31
-
32
- apply_scopes(%w(open withdrawn published), state)
33
- end
34
-
35
- # Filters drafts by the name of the classes they are linked to. By default,
36
- # returns all drafts. When a `related_to` param is given, then it camelcases item
37
- # to find the real class name and checks the links for the Collaborative Draft.
38
- #
39
- # The `related_to` param is expected to be in this form:
40
- #
41
- # "decidim/meetings/meeting"
42
- #
43
- # This can be achieved by performing `klass.name.underscore`.
44
- #
45
- # Returns only those drafts that are linked to the given class name.
46
- def search_related_to
47
- from = query
48
- .joins(:resource_links_from)
49
- .where(decidim_resource_links: { to_type: related_to.camelcase })
50
-
51
- to = query
52
- .joins(:resource_links_to)
53
- .where(decidim_resource_links: { from_type: related_to.camelcase })
54
-
55
- query.where(id: from).or(query.where(id: to))
56
- end
57
- end
58
- end
59
- end
@@ -1,6 +0,0 @@
1
- <div class="callout callout--full <%= css %>" data-closable>
2
- <%= text %>
3
- <button class="close-button" type="button" data-close="">
4
- <span aria-hidden="true">×</span>
5
- </button>
6
- </div>
@@ -1,26 +0,0 @@
1
- <% if flash.now[:error].present? %>
2
- $("#js-form-recategorize-proposals #category_id").addClass("is-invalid-input")
3
- $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{alert}, text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
4
- <% end %>
5
-
6
- <% if flash.now[:alert].present? %>
7
- $("#js-form-recategorize-proposals #category_id").removeClass("is-invalid-input")
8
- $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{warning}, text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
9
- <% end %>
10
-
11
- <% if flash.now[:notice].present? %>
12
- $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
13
-
14
- <% proposal_ids.each do |id| %>
15
- $(".table-list [data-id='<%= id %>']")
16
- .replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: { proposal: proposal_find(id) }) %>");
17
- <% end %>
18
-
19
- $("#js-form-recategorize-proposals #category_id").removeClass("is-invalid-input")
20
- $(".js-check-all").prop('checked', false);
21
- $(".js-check-all-proposal").prop('checked', false);
22
- window.hideBulkActionsButton();
23
- window.hideBulkActionForms();
24
- window.showOtherActionsButtons();
25
- window.selectedProposalsCountUpdate();
26
- <% end %>
@@ -1,27 +0,0 @@
1
- <% if flash.now[:error].present? %>
2
- $("#js-form-scope-change-proposals #scope_id").addClass("is-invalid-input")
3
- $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{alert}, text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
4
- <% end %>
5
-
6
- <% if flash.now[:alert].present? %>
7
- $("#js-form-scope-change-proposals #scope_id").removeClass("is-invalid-input")
8
- $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{warning}, text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
9
- <% end %>
10
-
11
- <% if flash.now[:notice].present? %>
12
- $("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
13
-
14
- <% @proposal_ids.each do |id| %>
15
- $(".table-list [data-id='<%= id %>']")
16
- .replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: { proposal: proposal_find(id) }) %>");
17
- <% end %>
18
-
19
- $("#js-form-scope-change-proposals #scope_id").removeClass("is-invalid-input")
20
- $(".js-check-all").prop('checked', false);
21
- $(".js-check-all-proposal").prop('checked', false);
22
-
23
- window.hideBulkActionForms();
24
- window.hideBulkActionsButton();
25
- window.showOtherActionsButtons();
26
- window.selectedProposalsCountUpdate();
27
- <% end %>