decidim-results 0.4.3 → 0.4.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/decidim/results/result_widgets_controller.rb +0 -2
  3. data/app/forms/decidim/results/admin/result_form.rb +4 -0
  4. data/app/views/decidim/results/admin/results/index.html.erb +1 -1
  5. data/app/views/decidim/results/results/_tags.html.erb +2 -2
  6. data/lib/decidim/results/feature.rb +18 -22
  7. metadata +29 -15
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 92f4ef28334583f882ea7ac0507d1adcf1cc7776
4
- data.tar.gz: 6e577fbc6e8ca79820858d533c7cfe9cbf12e4d0
3
+ metadata.gz: 0e87f3b4a655ec87ba8ed404f0237dca5b971586
4
+ data.tar.gz: e349dc188dd9b5f9ceb058d3c743509b187054e2
5
5
  SHA512:
6
- metadata.gz: 74f19259b80aa9061133949a87ebfab3d2c7c66f80f0350044d6fee001483415b1a9ab4e270188b24108012a772a71e030d945be0c47ecc782f417523f874729
7
- data.tar.gz: a87096c12dbf727beec44cd2af6faeac6235da8a0dc16f277e2f0adfcccbb248d1121fabf5edc3e99a4ca8ddf7776fa93ed85a57bc3b7a6e7aebe19d2ae9d468
6
+ metadata.gz: 4af6cfb80daee17b9079e84f7470282e57e8137f3902d5578071a848788d143fefb6135e094e6b6e592d4f7f90935546572f0f0880ebf82dc51d5aeffc3e6942
7
+ data.tar.gz: ad3cff5a527eed0dc1a672ea0527ae9e1b1858b283f03de858d3cd80c8fb7edc0a83685f568b97d88fd6e5a9d02bcab28307f6efeb303dd29702206491929814
data/app/controllers/decidim/results/result_widgets_controller.rb CHANGED
@@ -3,8 +3,6 @@
3
3
  module Decidim
4
4
  module Results
5
5
  class ResultWidgetsController < Decidim::WidgetsController
6
- helper_method :model
7
-
8
6
  private
9
7
 
10
8
  def model
data/app/forms/decidim/results/admin/result_form.rb CHANGED
@@ -22,6 +22,10 @@ module Decidim
22
22
 
23
23
  def map_model(model)
24
24
  self.proposal_ids = model.linked_resources(:proposals, "included_proposals").pluck(:id)
25
+
26
+ return unless model.categorization
27
+
28
+ self.decidim_category_id = model.categorization.decidim_category_id
25
29
  end
26
30
 
27
31
  def proposals
data/app/views/decidim/results/admin/results/index.html.erb CHANGED
@@ -22,7 +22,7 @@
22
22
  <%= translated_attribute(result.title) %><br />
23
23
  </td>
24
24
  <td class="table-list__actions">
25
- <%= icon_link_to "eye", decidim_results.result_path(id: result, feature_id: current_feature, participatory_process_id: current_participatory_process), t("actions.preview", scope: "decidim.results"), class: "action-icon--preview", target: :blank %>
25
+ <%= icon_link_to "eye", resource_locator(result).path, t("actions.preview", scope: "decidim.results"), class: "action-icon--preview", target: :blank %>
26
26
 
27
27
  <% if can? :update, current_feature %>
28
28
  <%= icon_link_to "pencil", edit_result_path(result), t("actions.edit", scope: "decidim.results"), class: "action-icon--edit" %>
data/app/views/decidim/results/results/_tags.html.erb CHANGED
@@ -1,10 +1,10 @@
1
1
  <% if result.category.present? || result.scope.present? %>
2
2
  <ul class="tags tags--result" >
3
3
  <% if result.category.present? %>
4
- <li><%= link_to translated_attribute(result.category.name), decidim_results.results_path(filter: { category_id: result.category.id }) %></li>
4
+ <li><%= link_to translated_attribute(result.category.name), resource_locator(result).index(filter: { category_id: result.category.id }) %></li>
5
5
  <% end %>
6
6
  <% if !current_participatory_process.scope && result.scope.present? %>
7
- <li><%= link_to result.scope.name, decidim_results.results_path(filter: { scope_id: [result.scope.id] }) %></li>
7
+ <li><%= link_to result.scope.name, resource_locator(result).index(filter: { scope_id: [result.scope.id] }) %></li>
8
8
  <% end %>
9
9
  </ul>
10
10
  <% end %>
data/lib/decidim/results/feature.rb CHANGED
@@ -33,30 +33,26 @@ Decidim.register_feature(:results) do |feature|
33
33
  settings.attribute :comments_blocked, type: :boolean, default: false
34
34
  end
35
35
 
36
- feature.seeds do
37
- Decidim::ParticipatoryProcess.find_each do |process|
38
- next unless process.steps.any?
39
-
40
- feature = Decidim::Feature.create!(
41
- name: Decidim::Features::Namer.new(process.organization.available_locales, :results).i18n_name,
42
- manifest_name: :results,
43
- published_at: Time.current,
44
- participatory_process: process
36
+ feature.seeds do |process|
37
+ feature = Decidim::Feature.create!(
38
+ name: Decidim::Features::Namer.new(process.organization.available_locales, :results).i18n_name,
39
+ manifest_name: :results,
40
+ published_at: Time.current,
41
+ participatory_process: process
42
+ )
43
+
44
+ 3.times do
45
+ result = Decidim::Results::Result.create!(
46
+ feature: feature,
47
+ scope: process.organization.scopes.sample,
48
+ category: process.categories.sample,
49
+ title: Decidim::Faker::Localized.sentence(2),
50
+ description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
51
+ Decidim::Faker::Localized.paragraph(3)
52
+ end
45
53
  )
46
54
 
47
- 3.times do
48
- result = Decidim::Results::Result.create!(
49
- feature: feature,
50
- scope: process.organization.scopes.sample,
51
- category: process.categories.sample,
52
- title: Decidim::Faker::Localized.sentence(2),
53
- description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
54
- Decidim::Faker::Localized.paragraph(3)
55
- end
56
- )
57
-
58
- Decidim::Comments::Seed.comments_for(result)
59
- end
55
+ Decidim::Comments::Seed.comments_for(result)
60
56
  end
61
57
  end
62
58
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decidim-results
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.3
4
+ version: 0.4.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josep Jaume Rey Peroy
@@ -18,28 +18,28 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 0.4.3
21
+ version: 0.4.4
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.4.3
28
+ version: 0.4.4
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: decidim-comments
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
33
  - - '='
34
34
  - !ruby/object:Gem::Version
35
- version: 0.4.3
35
+ version: 0.4.4
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.4.3
42
+ version: 0.4.4
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: rectify
45
45
  requirement: !ruby/object:Gem::Requirement
@@ -88,56 +88,70 @@ dependencies:
88
88
  requirements:
89
89
  - - '='
90
90
  - !ruby/object:Gem::Version
91
- version: 0.4.3
91
+ version: 0.4.4
92
92
  type: :development
93
93
  prerelease: false
94
94
  version_requirements: !ruby/object:Gem::Requirement
95
95
  requirements:
96
96
  - - '='
97
97
  - !ruby/object:Gem::Version
98
- version: 0.4.3
98
+ version: 0.4.4
99
99
  - !ruby/object:Gem::Dependency
100
- name: decidim-comments
100
+ name: decidim-admin
101
101
  requirement: !ruby/object:Gem::Requirement
102
102
  requirements:
103
103
  - - '='
104
104
  - !ruby/object:Gem::Version
105
- version: 0.4.3
105
+ version: 0.4.4
106
106
  type: :development
107
107
  prerelease: false
108
108
  version_requirements: !ruby/object:Gem::Requirement
109
109
  requirements:
110
110
  - - '='
111
111
  - !ruby/object:Gem::Version
112
- version: 0.4.3
112
+ version: 0.4.4
113
113
  - !ruby/object:Gem::Dependency
114
- name: decidim-meetings
114
+ name: decidim-comments
115
115
  requirement: !ruby/object:Gem::Requirement
116
116
  requirements:
117
117
  - - '='
118
118
  - !ruby/object:Gem::Version
119
- version: 0.4.3
119
+ version: 0.4.4
120
120
  type: :development
121
121
  prerelease: false
122
122
  version_requirements: !ruby/object:Gem::Requirement
123
123
  requirements:
124
124
  - - '='
125
125
  - !ruby/object:Gem::Version
126
- version: 0.4.3
126
+ version: 0.4.4
127
127
  - !ruby/object:Gem::Dependency
128
128
  name: decidim-proposals
129
129
  requirement: !ruby/object:Gem::Requirement
130
130
  requirements:
131
131
  - - '='
132
132
  - !ruby/object:Gem::Version
133
- version: 0.4.3
133
+ version: 0.4.4
134
+ type: :development
135
+ prerelease: false
136
+ version_requirements: !ruby/object:Gem::Requirement
137
+ requirements:
138
+ - - '='
139
+ - !ruby/object:Gem::Version
140
+ version: 0.4.4
141
+ - !ruby/object:Gem::Dependency
142
+ name: decidim-meetings
143
+ requirement: !ruby/object:Gem::Requirement
144
+ requirements:
145
+ - - '='
146
+ - !ruby/object:Gem::Version
147
+ version: 0.4.4
134
148
  type: :development
135
149
  prerelease: false
136
150
  version_requirements: !ruby/object:Gem::Requirement
137
151
  requirements:
138
152
  - - '='
139
153
  - !ruby/object:Gem::Version
140
- version: 0.4.3
154
+ version: 0.4.4
141
155
  description: A results component for decidim's participatory processes.
142
156
  email:
143
157
  - josepjaume@gmail.com