decidim-results 0.0.7 → 0.0.8.1

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 (16) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +2 -2
  3. data/app/controllers/decidim/results/result_widgets_controller.rb +17 -0
  4. data/app/controllers/decidim/results/results_controller.rb +1 -0
  5. data/app/views/decidim/results/result_widgets/show.html.erb +10 -0
  6. data/app/views/decidim/results/results/show.html.erb +1 -0
  7. data/config/locales/ca.yml +3 -3
  8. data/config/locales/en.yml +3 -3
  9. data/config/locales/es.yml +3 -3
  10. data/config/locales/eu.yml +0 -3
  11. data/config/locales/fi.yml +0 -3
  12. data/config/locales/fr.yml +5 -0
  13. data/config/locales/nl.yml +5 -0
  14. data/db/migrate/20170410074358_remove_not_null_reference_results.rb +5 -0
  15. data/lib/decidim/results/list_engine.rb +3 -1
  16. metadata +20 -15
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6bce1cb6ba23326936c124fdff52091a3b88d475
4
- data.tar.gz: 2dbacdf87d94a066fb1ab0ed62a33ce58d5ce2ec
3
+ metadata.gz: 7e4356f2a615206f1b6dd421749991b3ee2246a0
4
+ data.tar.gz: 4bca5a90b0eefb2187b6a83094481ea1e33c5dd1
5
5
  SHA512:
6
- metadata.gz: 5e210bf12e1a3c0adf709cb6b26052b11af284d1279379d38faf1bf27fe32dca58f87e479420f5a54c60e0a372f096610ba387802c5043c34b660ccfc3572b79
7
- data.tar.gz: 91fd009e2c25038bd8c54a79ebcff60043125071bd31f49073e58d4d40b8e34569ab0fcf94648405bb428a7d1db4c280024f21f274627df25241ac8215c20b0a
6
+ metadata.gz: f1c71e1c04236bc51ef4aa65e9e79349e49414f3a0a738e391f81669c8ef734ffabddb8d5a4b0284ae251889ce877f97215775ec17ef7b98e61529210b8f4499
7
+ data.tar.gz: 1bbf496bdee38cdfde0d41bc81c3bea55a19fae25416256feedffd602c1a93c080e170bc87d853948f0195062fa900d73cd924c563e431c8693a6b9890311d58
data/README.md CHANGED
@@ -17,7 +17,7 @@ $ bundle
17
17
  ```
18
18
 
19
19
  ## Contributing
20
- See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
20
+ See [Decidim](https://github.com/decidim/decidim).
21
21
 
22
22
  ## License
23
- See [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
23
+ See [Decidim](https://github.com/decidim/decidim).
data/app/controllers/decidim/results/result_widgets_controller.rb ADDED
@@ -0,0 +1,17 @@
1
+ module Decidim
2
+ module Results
3
+ class ResultWidgetsController < Decidim::WidgetsController
4
+ helper_method :model
5
+
6
+ private
7
+
8
+ def model
9
+ @model ||= Result.where(feature: params[:feature_id]).find(params[:result_id])
10
+ end
11
+
12
+ def iframe_url
13
+ @iframe_url ||= result_result_widget_url(model)
14
+ end
15
+ end
16
+ end
17
+ end
data/app/controllers/decidim/results/results_controller.rb CHANGED
@@ -5,6 +5,7 @@ module Decidim
5
5
  # Exposes the result resource so users can view them
6
6
  class ResultsController < Decidim::Results::ApplicationController
7
7
  include FilterResource
8
+ helper Decidim::WidgetUrlsHelper
8
9
 
9
10
  helper_method :results, :result, :stats_calculator
10
11
 
data/app/views/decidim/results/result_widgets/show.html.erb ADDED
@@ -0,0 +1,10 @@
1
+ <div class="column">
2
+ <article class="card card--result">
3
+ <div class="card__content">
4
+ <%= link_to model, class: "card__link" do %>
5
+ <h5 class="card__title"><%= translated_attribute model.title %></h5>
6
+ <% end %>
7
+ <%== translated_attribute model.description %>
8
+ </div>
9
+ </article>
10
+ </div>
data/app/views/decidim/results/results/show.html.erb CHANGED
@@ -40,6 +40,7 @@
40
40
  </div>
41
41
  <%= feature_reference(result) %>
42
42
  <%= render partial: "decidim/shared/share_modal" %>
43
+ <%= embed_modal_for result_result_widget_url(result, format: :js) %>
43
44
  </div>
44
45
  <div class="columns mediumlarge-8 mediumlarge-pull-4">
45
46
  <div class="section">
data/config/locales/ca.yml CHANGED
@@ -26,7 +26,7 @@ ca:
26
26
  confirm_destroy: Esteu segur que voleu suprimir aquest resultat?
27
27
  destroy: Esborra
28
28
  edit: Edita
29
- new: Nou/va %{name}
29
+ new: Nou
30
30
  preview: Previsualitzar
31
31
  title: Accions
32
32
  admin:
@@ -41,11 +41,11 @@ ca:
41
41
  success: El resultat ha estat eliminat correctament
42
42
  edit:
43
43
  title: Edita resultat
44
- update: Actualitza resultat
44
+ update: Actualitzar
45
45
  index:
46
46
  title: Resultats
47
47
  new:
48
- create: Crea resultat
48
+ create: Crear
49
49
  title: Nou resultat
50
50
  update:
51
51
  invalid: Hi ha hagut un problema en actualitzar aquest resultat
data/config/locales/en.yml CHANGED
@@ -27,7 +27,7 @@ en:
27
27
  confirm_destroy: Are you sure you want to delete this result?
28
28
  destroy: Delete
29
29
  edit: Edit
30
- new: New %{name}
30
+ new: New
31
31
  preview: Preview
32
32
  title: Actions
33
33
  admin:
@@ -42,11 +42,11 @@ en:
42
42
  success: Result successfully deleted
43
43
  edit:
44
44
  title: Edit result
45
- update: Update result
45
+ update: Update
46
46
  index:
47
47
  title: Results
48
48
  new:
49
- create: Create result
49
+ create: Create
50
50
  title: New result
51
51
  update:
52
52
  invalid: There's been a problem updating this result
data/config/locales/es.yml CHANGED
@@ -26,7 +26,7 @@ es:
26
26
  confirm_destroy: '¿Está seguro de que quiere eliminar este resultado?'
27
27
  destroy: Borrar
28
28
  edit: Editar
29
- new: Nuevo/a %{name}
29
+ new: Nuevo
30
30
  preview: Previsualizar
31
31
  title: Acciones
32
32
  admin:
@@ -41,11 +41,11 @@ es:
41
41
  success: El resultado se ha eliminado correctamente
42
42
  edit:
43
43
  title: Editar resultado
44
- update: Actualizar resultado
44
+ update: Actualizar
45
45
  index:
46
46
  title: Resultados
47
47
  new:
48
- create: Crear resultado
48
+ create: Crear
49
49
  title: Nuevo resultado
50
50
  update:
51
51
  invalid: Ha habido un problema al actualizar este resultado
data/config/locales/eu.yml CHANGED
@@ -26,7 +26,6 @@ eu:
26
26
  confirm_destroy: Ziur zaude emaitza hau ezabatu nahi duzula?
27
27
  destroy: Ezabatu
28
28
  edit: Editatu
29
- new: '%{name} berria'
30
29
  preview: Aurreikusi
31
30
  title: Ekintzak
32
31
  admin:
@@ -41,11 +40,9 @@ eu:
41
40
  success: Emaitza zuzen ezabatu da.
42
41
  edit:
43
42
  title: Editatu emaitza
44
- update: Eguneratu emaitza
45
43
  index:
46
44
  title: Emaitzak
47
45
  new:
48
- create: Sortu emaitza
49
46
  title: Emaitza berria
50
47
  update:
51
48
  invalid: Arazo bat izan da emaitza hau eguneratzean.
data/config/locales/fi.yml CHANGED
@@ -26,7 +26,6 @@ fi:
26
26
  confirm_destroy: Oletko varma, että haluat poistaa tämän tuloksen?
27
27
  destroy: Poista
28
28
  edit: Muokkaa
29
- new: Uusi %{name}
30
29
  title: Toiminnot
31
30
  admin:
32
31
  models:
@@ -40,11 +39,9 @@ fi:
40
39
  success: Tulos poistettu onnistuneesti
41
40
  edit:
42
41
  title: Muokkaa tulosta
43
- update: Päivitä tulos
44
42
  index:
45
43
  title: Tulokset
46
44
  new:
47
- create: Luo tulos
48
45
  title: Uusi tulos
49
46
  update:
50
47
  invalid: Tuloksen päivityksessä tapahtui virhe
data/config/locales/fr.yml ADDED
@@ -0,0 +1,5 @@
1
+ fr:
2
+ activemodel:
3
+ attributes:
4
+ result:
5
+ decidim_category_id: Catégorie
data/config/locales/nl.yml ADDED
@@ -0,0 +1,5 @@
1
+ nl:
2
+ activemodel:
3
+ attributes:
4
+ result:
5
+ title: Titel
data/db/migrate/20170410074358_remove_not_null_reference_results.rb ADDED
@@ -0,0 +1,5 @@
1
+ class RemoveNotNullReferenceResults < ActiveRecord::Migration[5.0]
2
+ def change
3
+ change_column_null :decidim_results_results, :reference, true
4
+ end
5
+ end
data/lib/decidim/results/list_engine.rb CHANGED
@@ -11,7 +11,9 @@ module Decidim
11
11
  isolate_namespace Decidim::Results
12
12
 
13
13
  routes do
14
- resources :results, only: [:index, :show]
14
+ resources :results, only: [:index, :show] do
15
+ resource :result_widget, only: :show, path: "embed"
16
+ end
15
17
  root to: "results#index"
16
18
  end
17
19
  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.0.7
4
+ version: 0.0.8.1
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: 2017-04-07 00:00:00.000000000 Z
13
+ date: 2017-04-27 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 0.0.7
21
+ version: 0.0.8.1
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.0.7
28
+ version: 0.0.8.1
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.0.7
35
+ version: 0.0.8.1
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.0.7
42
+ version: 0.0.8.1
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: rectify
45
45
  requirement: !ruby/object:Gem::Requirement
@@ -88,56 +88,56 @@ dependencies:
88
88
  requirements:
89
89
  - - '='
90
90
  - !ruby/object:Gem::Version
91
- version: 0.0.7
91
+ version: 0.0.8.1
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.0.7
98
+ version: 0.0.8.1
99
99
  - !ruby/object:Gem::Dependency
100
100
  name: decidim-comments
101
101
  requirement: !ruby/object:Gem::Requirement
102
102
  requirements:
103
103
  - - '='
104
104
  - !ruby/object:Gem::Version
105
- version: 0.0.7
105
+ version: 0.0.8.1
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.0.7
112
+ version: 0.0.8.1
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: decidim-meetings
115
115
  requirement: !ruby/object:Gem::Requirement
116
116
  requirements:
117
117
  - - '='
118
118
  - !ruby/object:Gem::Version
119
- version: 0.0.7
119
+ version: 0.0.8.1
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.0.7
126
+ version: 0.0.8.1
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.0.7
133
+ version: 0.0.8.1
134
134
  type: :development
135
135
  prerelease: false
136
136
  version_requirements: !ruby/object:Gem::Requirement
137
137
  requirements:
138
138
  - - '='
139
139
  - !ruby/object:Gem::Version
140
- version: 0.0.7
140
+ version: 0.0.8.1
141
141
  description: ''
142
142
  email:
143
143
  - josepjaume@gmail.com
@@ -155,6 +155,7 @@ files:
155
155
  - app/controllers/decidim/results/admin/application_controller.rb
156
156
  - app/controllers/decidim/results/admin/results_controller.rb
157
157
  - app/controllers/decidim/results/application_controller.rb
158
+ - app/controllers/decidim/results/result_widgets_controller.rb
158
159
  - app/controllers/decidim/results/results_controller.rb
159
160
  - app/forms/decidim/results/admin/result_form.rb
160
161
  - app/helpers/decidim/results/application_helper.rb
@@ -166,6 +167,7 @@ files:
166
167
  - app/views/decidim/results/admin/results/edit.html.erb
167
168
  - app/views/decidim/results/admin/results/index.html.erb
168
169
  - app/views/decidim/results/admin/results/new.html.erb
170
+ - app/views/decidim/results/result_widgets/show.html.erb
169
171
  - app/views/decidim/results/results/_count.html.erb
170
172
  - app/views/decidim/results/results/_filters.html.erb
171
173
  - app/views/decidim/results/results/_filters_small_view.html.erb
@@ -181,16 +183,19 @@ files:
181
183
  - config/locales/es.yml
182
184
  - config/locales/eu.yml
183
185
  - config/locales/fi.yml
186
+ - config/locales/fr.yml
187
+ - config/locales/nl.yml
184
188
  - db/migrate/20170116104125_create_results.rb
185
189
  - db/migrate/20170129164553_remove_short_description_from_results.rb
186
190
  - db/migrate/20170215132624_add_reference_to_results.rb
191
+ - db/migrate/20170410074358_remove_not_null_reference_results.rb
187
192
  - lib/decidim/results.rb
188
193
  - lib/decidim/results/admin.rb
189
194
  - lib/decidim/results/admin_engine.rb
190
195
  - lib/decidim/results/feature.rb
191
196
  - lib/decidim/results/list_engine.rb
192
197
  - lib/decidim/results/test/factories.rb
193
- homepage: https://github.com/AjuntamentdeBarcelona/decidim
198
+ homepage: https://github.com/decidim/decidim
194
199
  licenses:
195
200
  - AGPLv3
196
201
  metadata: {}