decidim-results 0.0.5 → 0.0.6

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 261211327c81628f79052e961210bac9bea4bcf6
4
- data.tar.gz: eac6d159d8e9fc48bd38a17f5ca64c8363f756f1
3
+ metadata.gz: c066d1ecdece68bae8448750981b11706737c8c4
4
+ data.tar.gz: e89b37fd8c66171a1389f78cfd5e47e8aa711682
5
5
  SHA512:
6
- metadata.gz: 9286d8c4a2ecc6fed04858739afd96158f7fff82c57b956d5520d794c0a267313c18c5150f05fd67acc035bf068dc7bd58d675e9dbb310b34a2e3aaf196df5a0
7
- data.tar.gz: 1a98a65bd335620cb04a26203d427fd820894e89f4544cdfdb28aa17bbacbf0eb5c5e124aa2a1dab47604318e9611ec27ebb8f8a77c8e9bbb8be83d33c1612dd
6
+ metadata.gz: 5d1d9ba2bb0e7fe263f15face6169526a8f73d45682102faf72222d316a107429d9207469892dca98c34f2b79f58c043655de036bd0b7c4e1d80b604e1bb4a68
7
+ data.tar.gz: fa9ed6e4f5e366609e30e93ff97227cf4d2cb888300a2786b23d65ec8ff15f2fafbdcf8d5a6904e61f7aa6ba419e13e4309da288d8d2df6f9778d6ac3b9ac5fc
@@ -27,8 +27,16 @@ module Decidim
27
27
  @proposals ||= Decidim.find_resource_manifest(:proposals).try(:resource_scope, context.current_feature)&.order(title: :asc)&.pluck(:title, :id)
28
28
  end
29
29
 
30
+ def organization_scopes
31
+ current_organization.scopes
32
+ end
33
+
34
+ def process_scope
35
+ current_feature.participatory_process.scope
36
+ end
37
+
30
38
  def scope
31
- @scope ||= context.current_feature.scopes.where(id: decidim_scope_id).first
39
+ @scope ||= process_scope || organization_scopes.where(id: decidim_scope_id).first
32
40
  end
33
41
 
34
42
  def category
@@ -8,6 +8,7 @@ module Decidim
8
8
  include Decidim::HasFeature
9
9
  include Decidim::HasScope
10
10
  include Decidim::HasCategory
11
+ include Decidim::HasReference
11
12
  include Decidim::Comments::Commentable
12
13
 
13
14
  feature_manifest_name "results"
@@ -19,7 +20,7 @@ module Decidim
19
20
 
20
21
  # Public: Overrides the `accepts_new_comments?` Commentable concern method.
21
22
  def accepts_new_comments?
22
- commentable? && !feature.active_step_settings.comments_blocked
23
+ commentable? && !feature.active_step_settings.comments_blocked
23
24
  end
24
25
 
25
26
  # Public: Overrides the `comments_have_alignment?` Commentable concern method.
@@ -20,11 +20,6 @@ module Decidim
20
20
  .or(query.where(localized_search_text_in(:description), text: "%#{search_text}%"))
21
21
  end
22
22
 
23
- # Handle the scope_id filter
24
- def search_scope_id
25
- query.where(decidim_scope_id: scope_id)
26
- end
27
-
28
23
  private
29
24
 
30
25
  # Internal: builds the needed query to search for a text in the organization's
@@ -6,9 +6,11 @@
6
6
  <%= form.translated :editor, :description %>
7
7
  </div>
8
8
 
9
- <div class="field" >
10
- <%= form.collection_select :decidim_scope_id, current_organization.scopes, :id, :name, include_blank: true %>
11
- </div>
9
+ <% if !@form.process_scope %>
10
+ <div class="field" >
11
+ <%= form.collection_select :decidim_scope_id, organization_scopes, :id, :name %>
12
+ </div>
13
+ <% end %>
12
14
 
13
15
  <div class="field" >
14
16
  <%= form.categories_select :decidim_category_id, current_participatory_process.categories, include_blank: true, disable_parents: false %>
@@ -12,8 +12,8 @@
12
12
  </div>
13
13
  </div>
14
14
 
15
- <% if current_organization.scopes.any? %>
16
- <%= form.collection_check_boxes :scope_id, current_organization.scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t('.scopes') %>
15
+ <% if current_organization.scopes.any? && !current_participatory_process.scope %>
16
+ <%= form.collection_check_boxes :scope_id, search_organization_scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t('.scopes') %>
17
17
  <% end %>
18
18
 
19
19
  <% if current_feature.categories.any? %>
@@ -0,0 +1,18 @@
1
+ <div class="filters-controls hide-for-mediumlarge">
2
+ <button data-open="filter-box" class="filters-controls__trigger">
3
+ <%= t ".filter" %>
4
+ <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t('.unfold'), role: "img" %>
5
+ </button>
6
+ </div>
7
+
8
+ <div class="reveal" id="filter-box" data-reveal>
9
+ <div class="reveal__header">
10
+ <h3 class="reveal__title"><%= t ".filter_by" %>:</h3>
11
+ <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
12
+ <span aria-hidden="true">&times;</span>
13
+ </button>
14
+ </div>
15
+ <div class="filters">
16
+ <%= render partial: "filters" %>
17
+ </div>
18
+ </div>
@@ -3,7 +3,7 @@
3
3
  <% if result.category.present? %>
4
4
  <li><%= link_to translated_attribute(result.category.name), decidim_results.results_path(filter: { category_id: result.category.id }) %></li>
5
5
  <% end %>
6
- <% if result.scope.present? %>
6
+ <% if !current_participatory_process.scope && result.scope.present? %>
7
7
  <li><%= link_to result.scope.name, decidim_results.results_path(filter: { scope_id: [result.scope.id] }) %></li>
8
8
  <% end %>
9
9
  </ul>
@@ -8,6 +8,7 @@
8
8
 
9
9
  <div class="row">
10
10
  <div class="columns mediumlarge-4 large-3">
11
+ <%= render partial: "filters_small_view"%>
11
12
  <div class="card card--secondary show-for-mediumlarge" >
12
13
  <%= render partial: "filters" %>
13
14
  </div>
@@ -38,6 +38,7 @@
38
38
  </div>
39
39
  </div>
40
40
  </div>
41
+ <%= feature_reference(result) %>
41
42
  <%= render partial: "decidim/shared/share_modal" %>
42
43
  </div>
43
44
  <div class="columns mediumlarge-8 mediumlarge-pull-4">
@@ -4,3 +4,5 @@ ignore_unused:
4
4
  - "decidim.features.results.name"
5
5
  - "decidim.features.results.settings.*"
6
6
  - "decidim.resource_links.*"
7
+ - activerecord.attributes.*
8
+ - activemodel.attributes.*
@@ -1,4 +1,12 @@
1
1
  ca:
2
+ activemodel:
3
+ attributes:
4
+ result:
5
+ decidim_category_id: Categoria
6
+ decidim_scope_id: Àmbit
7
+ description: Descripció
8
+ proposal_ids: Propostes incloses
9
+ title: Títol
2
10
  decidim:
3
11
  features:
4
12
  results:
@@ -10,9 +18,9 @@ ca:
10
18
  comments_blocked: Comentaris bloquejats
11
19
  resource_links:
12
20
  included_proposals:
13
- proposals: Propostes incloses en aquest resultat
21
+ result_proposals: Propostes incloses en aquest resultat
14
22
  meetings_through_proposals:
15
- meetings: Trobades relacionades
23
+ result_meetings: Trobades relacionades
16
24
  results:
17
25
  actions:
18
26
  confirm_destroy: Esteu segur que voleu suprimir aquest resultat?
@@ -54,6 +62,11 @@ ca:
54
62
  category: Categoria
55
63
  scopes: Àmbits
56
64
  search: Cerca
65
+ filters_small_view:
66
+ close_modal: Tancar finestra
67
+ filter: Filtra
68
+ filter_by: Filtra per
69
+ unfold: Desplega
57
70
  show:
58
71
  stats:
59
72
  attendees: Assistents
@@ -1,5 +1,13 @@
1
1
  ---
2
2
  en:
3
+ activemodel:
4
+ attributes:
5
+ result:
6
+ decidim_category_id: Category
7
+ decidim_scope_id: Scope
8
+ description: Description
9
+ proposal_ids: Included proposals
10
+ title: Title
3
11
  decidim:
4
12
  features:
5
13
  results:
@@ -11,9 +19,9 @@ en:
11
19
  comments_blocked: Comments blocked
12
20
  resource_links:
13
21
  included_proposals:
14
- proposals: Proposals included in this result
22
+ result_proposals: Proposals included in this result
15
23
  meetings_through_proposals:
16
- meetings: Related meetings
24
+ result_meetings: Related meetings
17
25
  results:
18
26
  actions:
19
27
  confirm_destroy: Are you sure you want to delete this result?
@@ -55,6 +63,11 @@ en:
55
63
  category: Category
56
64
  scopes: Scopes
57
65
  search: Search
66
+ filters_small_view:
67
+ close_modal: Close modal
68
+ filter: Filter
69
+ filter_by: Filter by
70
+ unfold: Unfold
58
71
  show:
59
72
  stats:
60
73
  attendees: Attendees
@@ -1,4 +1,12 @@
1
1
  es:
2
+ activemodel:
3
+ attributes:
4
+ result:
5
+ decidim_category_id: Categoría
6
+ decidim_scope_id: Ámbito
7
+ description: Descripción
8
+ proposal_ids: Propuestas incluidas
9
+ title: Título
2
10
  decidim:
3
11
  features:
4
12
  results:
@@ -10,9 +18,9 @@ es:
10
18
  comments_blocked: Comentarios bloqueados
11
19
  resource_links:
12
20
  included_proposals:
13
- proposals: Propuestas incluidas en este resultado
21
+ result_proposals: Propuestas incluidas en este resultado
14
22
  meetings_through_proposals:
15
- meetings: Encuentros relacionados
23
+ result_meetings: Encuentros relacionados
16
24
  results:
17
25
  actions:
18
26
  confirm_destroy: '¿Está seguro de que quiere eliminar este resultado?'
@@ -54,6 +62,11 @@ es:
54
62
  category: Categoría
55
63
  scopes: Ámbitos
56
64
  search: Buscar
65
+ filters_small_view:
66
+ close_modal: Cerrar ventana
67
+ filter: Filtrar
68
+ filter_by: Filtrar por
69
+ unfold: Desplegar
57
70
  show:
58
71
  stats:
59
72
  attendees: Asistentes
@@ -2,4 +2,60 @@ eu:
2
2
  decidim:
3
3
  features:
4
4
  results:
5
- name: Emaitzak
5
+ name: Emaitzak
6
+ resource_links:
7
+ included_proposals:
8
+ result_proposals: Emaitza honetan jasotako proposamenak
9
+ meetings_through_proposals:
10
+ result_meetings: Honekin lotutako topaketak
11
+ results:
12
+ actions:
13
+ confirm_destroy: Ziur zaude emaitza hau ezabatu nahi duzula?
14
+ destroy: Garbitu
15
+ edit: Editatu
16
+ new: '%{name} berria'
17
+ title: Ekintzak
18
+ admin:
19
+ models:
20
+ result:
21
+ name: Emaitza
22
+ results:
23
+ create:
24
+ invalid: Arazo bat izan da emaitza hau sortzean.
25
+ success: Emaitza zuzen sortu da
26
+ destroy:
27
+ success: Emaitza zuzen ezabatu da.
28
+ edit:
29
+ title: Editatu emaitza
30
+ update: Eguneratu emaitza
31
+ index:
32
+ title: Emaitzak
33
+ new:
34
+ create: Sortu emaitza
35
+ title: Emaitza berria
36
+ update:
37
+ invalid: Arazo bat izan da emaitza hau eguneratzean.
38
+ success: Emaitza zuzen eguneratu da.
39
+ models:
40
+ result:
41
+ fields:
42
+ title: Izenburua
43
+ results:
44
+ count:
45
+ results_count:
46
+ one: Emaitza bat
47
+ other: "%{count} emaitza"
48
+ filters:
49
+ category: Kategoria
50
+ scopes: Esparruak
51
+ search: Bilatu
52
+ filters_small_view:
53
+ filter_by: 'Iragazi honen arabera:'
54
+ show:
55
+ stats:
56
+ attendees: Bertaratuak
57
+ comments: Iruzkinak
58
+ contributions: Ekarpenak
59
+ meetings: Topaketa-zerrenda
60
+ proposals: Proposamenak
61
+ votes: Euskarria
@@ -0,0 +1,77 @@
1
+ fi:
2
+ activemodel:
3
+ attributes:
4
+ result:
5
+ decidim_category_id: Kategoria
6
+ decidim_scope_id: Konteksti
7
+ description: Kuvaus
8
+ proposal_ids: Sisällytetyt ehdotukset
9
+ title: Otsikko
10
+ decidim:
11
+ features:
12
+ results:
13
+ name: Tulokset
14
+ settings:
15
+ global:
16
+ comments_enabled: Kommentointi sallittu
17
+ step:
18
+ comments_blocked: Kommentointi estetty
19
+ resource_links:
20
+ included_proposals:
21
+ result_proposals: Projektit, jotka sisältyvät tähän tulokseen
22
+ meetings_through_proposals:
23
+ result_meetings: Liittyvät tapaamiset
24
+ results:
25
+ actions:
26
+ confirm_destroy: Oletko varma, että haluat poistaa tämän tuloksen?
27
+ destroy: Poista
28
+ edit: Muokkaa
29
+ new: Uusi %{name}
30
+ title: Toiminnot
31
+ admin:
32
+ models:
33
+ result:
34
+ name: Tulos
35
+ results:
36
+ create:
37
+ invalid: Tuloksen luonnissa tapahtui virhe
38
+ success: Tulos luotu onnistuneesti
39
+ destroy:
40
+ success: Tulos poistettu onnistuneesti
41
+ edit:
42
+ title: Muokkaa tulosta
43
+ update: Päivitä tulos
44
+ index:
45
+ title: Tulokset
46
+ new:
47
+ create: Luo tulos
48
+ title: Uusi tulos
49
+ update:
50
+ invalid: Tuloksen päivityksessä tapahtui virhe
51
+ success: Tulos päivitetty onnistuneesti
52
+ models:
53
+ result:
54
+ fields:
55
+ title: Otsikko
56
+ results:
57
+ count:
58
+ results_count:
59
+ one: 1 tulos
60
+ other: "%{count} tulosta"
61
+ filters:
62
+ category: Kategoria
63
+ scopes: Konteksti
64
+ search: Haku
65
+ filters_small_view:
66
+ close_modal: Sulje ikkuna
67
+ filter: Suodata
68
+ filter_by: Suodata
69
+ unfold: Avaa
70
+ show:
71
+ stats:
72
+ attendees: Osallistujat
73
+ comments: Kommentit
74
+ contributions: Kontribuutiot
75
+ meetings: Tapaamiset
76
+ proposals: Ehdotukset
77
+ votes: Kannatukset
@@ -0,0 +1,7 @@
1
+ class AddReferenceToResults < ActiveRecord::Migration[5.0]
2
+ def change
3
+ add_column :decidim_results_results, :reference, :string
4
+ Decidim::Results::Result.find_each(&:save)
5
+ change_column_null :decidim_results_results, :reference, false
6
+ end
7
+ end
@@ -3,6 +3,12 @@ require "decidim/faker/localized"
3
3
  require "decidim/dev"
4
4
 
5
5
  FactoryGirl.define do
6
+ factory :result_feature, parent: :feature do
7
+ name { Decidim::Features::Namer.new(participatory_process.organization.available_locales, :results).i18n_name }
8
+ manifest_name :results
9
+ participatory_process { create(:participatory_process, :with_steps) }
10
+ end
11
+
6
12
  factory :result, class: Decidim::Results::Result do
7
13
  title { Decidim::Faker::Localized.sentence(3) }
8
14
  description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
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.5
4
+ version: 0.0.6
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-02-17 00:00:00.000000000 Z
13
+ date: 2017-03-24 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.5
21
+ version: 0.0.6
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.5
28
+ version: 0.0.6
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.5
35
+ version: 0.0.6
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.5
42
+ version: 0.0.6
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.5
91
+ version: 0.0.6
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.5
98
+ version: 0.0.6
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.5
105
+ version: 0.0.6
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.5
112
+ version: 0.0.6
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.5
119
+ version: 0.0.6
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.5
126
+ version: 0.0.6
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.5
133
+ version: 0.0.6
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.5
140
+ version: 0.0.6
141
141
  description: ''
142
142
  email:
143
143
  - josepjaume@gmail.com
@@ -168,6 +168,7 @@ files:
168
168
  - app/views/decidim/results/admin/results/new.html.erb
169
169
  - app/views/decidim/results/results/_count.html.erb
170
170
  - app/views/decidim/results/results/_filters.html.erb
171
+ - app/views/decidim/results/results/_filters_small_view.html.erb
171
172
  - app/views/decidim/results/results/_linked_results.html.erb
172
173
  - app/views/decidim/results/results/_results.html.erb
173
174
  - app/views/decidim/results/results/_tags.html.erb
@@ -179,8 +180,10 @@ files:
179
180
  - config/locales/en.yml
180
181
  - config/locales/es.yml
181
182
  - config/locales/eu.yml
183
+ - config/locales/fi.yml
182
184
  - db/migrate/20170116104125_create_results.rb
183
185
  - db/migrate/20170129164553_remove_short_description_from_results.rb
186
+ - db/migrate/20170215132624_add_reference_to_results.rb
184
187
  - lib/decidim/results.rb
185
188
  - lib/decidim/results/admin.rb
186
189
  - lib/decidim/results/admin_engine.rb