decidim-accountability 0.26.2 → 0.26.3

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 (13) hide show
  1. checksums.yaml +4 -4
  2. data/app/permissions/decidim/accountability/admin/permissions.rb +7 -1
  3. data/app/views/decidim/accountability/admin/results/index.html.erb +1 -1
  4. data/app/views/decidim/accountability/results/_results_leaf.html.erb +2 -2
  5. data/app/views/decidim/accountability/results/_show_leaf.html.erb +2 -2
  6. data/app/views/decidim/accountability/results/_timeline.html.erb +1 -1
  7. data/config/locales/hu.yml +9 -9
  8. data/config/locales/lt.yml +2 -0
  9. data/config/locales/nl.yml +1 -0
  10. data/config/locales/no.yml +2 -2
  11. data/config/locales/oc-FR.yml +1 -0
  12. data/lib/decidim/accountability/version.rb +1 -1
  13. metadata +21 -20
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6dabc78ed0d6f7c560ca2065878a4d67c1f1d097012ff784395a9086f8802f5e
4
- data.tar.gz: 52a15c467053ed505103371bc23650f1c29b6fa8f312ce9b0686ee1c6846b9bc
3
+ metadata.gz: 6b5a897910fb650fdf93a9331332d1d25f6f5493fa28e31aa91dab08e198a708
4
+ data.tar.gz: 44e31bda483a1dd1f0bf54f5227c3865a2ee40f9264350bb438182701bcb83fd
5
5
  SHA512:
6
- metadata.gz: 35738d247310c5d74a211f84f3d68cb8e1060a990ad5ffa0b77890ff01ee72895ab6ee3376a824444a0dfe1d0c1df597096751b4228acdd9cdf3a211555f4fbb
7
- data.tar.gz: 3034823fb109927ed38aa130411f5bd18f4379e521935f3ced5f8587e50c9c58792f89e34ca241556268a368fb87be8b760ed2355852553d4a6ffa17a4cb5470
6
+ metadata.gz: 2273649a919372ce316bbe1c36cb001e1897c23eed728a9ef6d588d63af58f1f1e632bbf6177216d31651a8c3e6f8fc1b0bca278152b3ca27b4cb7f9457ddf10
7
+ data.tar.gz: 2e5495c60f9fb2caa7e222a37a47a6f0b3c6d9f992424c223aaa70b95de6910610665f92b55ca232c71613bcbb0cd67c710aee2075620c24b5046d5fb117efff
data/app/permissions/decidim/accountability/admin/permissions.rb CHANGED
@@ -30,9 +30,10 @@ module Decidim
30
30
 
31
31
  def can_perform_actions_on?(subject, resource)
32
32
  return unless permission_action.subject == subject
33
+ return false if can_create_grandchildren_results?
33
34
 
34
35
  case permission_action.action
35
- when :create
36
+ when :create, :create_children
36
37
  true
37
38
  when :update, :destroy
38
39
  resource.present?
@@ -40,6 +41,11 @@ module Decidim
40
41
  false
41
42
  end
42
43
  end
44
+
45
+ def can_create_grandchildren_results?
46
+ result&.parent&.present? &&
47
+ permission_action.action == :create_children
48
+ end
43
49
  end
44
50
  end
45
51
  end
data/app/views/decidim/accountability/admin/results/index.html.erb CHANGED
@@ -74,7 +74,7 @@
74
74
  <td class="table-list__actions">
75
75
  <%= icon_link_to "eye", resource_locator(result).path, t("actions.preview", scope: "decidim.accountability"), class: "action-icon--preview", target: :blank %>
76
76
 
77
- <% if allowed_to? :update, :result, result: result %>
77
+ <% if allowed_to? :create_children, :result, result: result %>
78
78
  <%= icon_link_to "plus", results_path(parent_id: result.id), t("actions.new", scope: "decidim.accountability", name: t("models.result.name", scope: "decidim.accountability.admin")), class: "action-icon--plus" %>
79
79
  <% end %>
80
80
 
data/app/views/decidim/accountability/results/_results_leaf.html.erb CHANGED
@@ -19,12 +19,12 @@
19
19
  <div class="text-small card--meta">
20
20
  <% if result.start_date %>
21
21
  <strong><%= t("models.result.fields.start_date", scope: "decidim.accountability") %></strong>
22
- <span><%= result.start_date %></span>
22
+ <span><%= l result.start_date, format: :decidim_short %></span>
23
23
  <% end %>
24
24
 
25
25
  <% if result.end_date %>
26
26
  <strong><%= t("models.result.fields.end_date", scope: "decidim.accountability") %></strong>
27
- <span><%= result.end_date %></span>
27
+ <span><%= l result.end_date, format: :decidim_short %></span>
28
28
  <% end %>
29
29
 
30
30
  <% if result.status %>
data/app/views/decidim/accountability/results/_show_leaf.html.erb CHANGED
@@ -31,14 +31,14 @@
31
31
  <div class="result-meta row">
32
32
  <% if result.start_date %>
33
33
  <div class="result-meta--label medium-2 columns"><%= t("models.result.fields.start_date", scope: "decidim.accountability") %></div>
34
- <div class="result-meta--data medium-10 columns"><%= result.start_date %></div>
34
+ <div class="result-meta--data medium-10 columns"><%= l result.start_date, format: :decidim_short %></div>
35
35
  <% end %>
36
36
  </div>
37
37
 
38
38
  <div class="result-meta row">
39
39
  <% if result.end_date %>
40
40
  <div class="result-meta--label medium-2 columns"><%= t("models.result.fields.end_date", scope: "decidim.accountability") %></div>
41
- <div class="result-meta--data medium-10 columns"><%= result.end_date %></div>
41
+ <div class="result-meta--data medium-10 columns"><%= l result.end_date, format: :decidim_short %></div>
42
42
  <% end %>
43
43
  </div>
44
44
 
data/app/views/decidim/accountability/results/_timeline.html.erb CHANGED
@@ -10,7 +10,7 @@
10
10
  <div class="timeline__info">
11
11
  <div class="timeline__description">
12
12
  <span class="timeline__date text-small">
13
- <%= timeline_entry.entry_date %>
13
+ <%= l timeline_entry.entry_date, format: :decidim_short %>
14
14
  </span>
15
15
  <h4 class="timeline__title">
16
16
  <%= translated_attribute timeline_entry.description %>
data/config/locales/hu.yml CHANGED
@@ -4,7 +4,7 @@ hu:
4
4
  result:
5
5
  decidim_accountability_status_id: Állapot
6
6
  decidim_category_id: Kategória
7
- decidim_scope_id: Hatáskör
7
+ decidim_scope_id: Hatókör
8
8
  description: Leírás
9
9
  end_date: Befejezés dátuma
10
10
  progress: Folyamat
@@ -94,7 +94,7 @@ hu:
94
94
  index:
95
95
  title: Állapotok
96
96
  new:
97
- create: Státusz létrehozása
97
+ create: Állapot létrehozása
98
98
  title: Új állapot
99
99
  update:
100
100
  invalid: Probléma történt az állapot frissítésekor
@@ -109,7 +109,7 @@ hu:
109
109
  title: Bejegyzés szerkesztése
110
110
  update: Bejegyzés frissítése
111
111
  index:
112
- title: Projekt ütemtervének bejegyzései
112
+ title: Projekt idővonal bejegyzései
113
113
  new:
114
114
  create: Bejegyzés létrehozása
115
115
  title: Új bejegyzés
@@ -170,7 +170,7 @@ hu:
170
170
  other: "%{count} találat"
171
171
  filters:
172
172
  all: Összes
173
- scopes: Hatáskörök
173
+ scopes: Hatókörök
174
174
  home:
175
175
  categories_label: Kategóriák
176
176
  subcategories_label: Alkategóriák
@@ -225,13 +225,13 @@ hu:
225
225
  accountability:
226
226
  proposal_linked:
227
227
  email_intro: 'A "%{proposal_title}" nevű javaslat szerepel az eredményben. Erről az oldalról érhető el:'
228
- email_outro: Ezt az értesítést azért kaptad, mert követed a(z) "%{proposal_title}" nevű ajánlást. Az értesítéseket a következő linkre kattintva kapcsolhatod ki.
228
+ email_outro: 'Ezt az értesítést azért kaptad, mert ezt követed: "%{proposal_title}". Az értesítéseket az előző linkre kattintva kapcsolhatod ki.'
229
229
  email_subject: A %{proposal_title} frissítve lett
230
230
  notification_title: 'A(z) <a href="%{proposal_path}">%{proposal_title}</a> javaslat szerepel ebben a(z) eredményben: <a href="%{resource_path}">%{resource_title}</a>.'
231
231
  result_progress_updated:
232
232
  email_intro: 'A "%{resource_title}" eredmény, amely magában foglalja a "%{proposal_title}" javaslatot, most már %{progress}% -ban teljes. Láthatod ezt erről oldalról:'
233
- email_outro: Ezt az értesítést azért kaptad, mert "%{proposal_title}" -t követed, és ez a javaslat szerepel a "%{resource_title}" eredményben. Leállíthatoa az értesítések fogadását követve az előző linket.
234
- email_subject: '%{resource_title} frissítése'
233
+ email_outro: Ezt az értesítést azért kaptad, mert "%{proposal_title}" -t követed, és ez a javaslat szerepel a "%{resource_title}" eredményben. Leállíthatod az értesítések fogadását követve az előző linket.
234
+ email_subject: '%{resource_title} frissítése folyamatban'
235
235
  notification_title: Az eredmény <a href="%{resource_path}">%{resource_title}</a>, amely magában foglalja a <a href="%{proposal_path}">%{proposal_title}</a>javaslatot, most %{progress}%-ban teljes.
236
236
  metrics:
237
237
  results:
@@ -243,8 +243,8 @@ hu:
243
243
  see_all: Eredmények megtekintése (%{count})
244
244
  resource_links:
245
245
  included_projects:
246
- result_project: Ebben az eredményben szereplő projektek
246
+ result_project: Az eredményben szereplő projektek
247
247
  included_proposals:
248
- result_proposal: Az eredménybe foglalt javaslatok
248
+ result_proposal: Ebben az eredményben szereplő javaslatok
249
249
  statistics:
250
250
  results_count: Találatok
data/config/locales/lt.yml CHANGED
@@ -180,6 +180,8 @@ lt:
180
180
  subcategories_label: Subkategorijos
181
181
  home_header:
182
182
  global_status: Bendra vykdymo būsena
183
+ nav_breadcrumb:
184
+ global: Bendras vykdymas
183
185
  search:
184
186
  search: Ieškoti veiksmų
185
187
  show:
data/config/locales/nl.yml CHANGED
@@ -49,6 +49,7 @@ nl:
49
49
  import_results:
50
50
  new:
51
51
  import: Importeren
52
+ info: "<p>Wij bevelen aan dat u de volgende stappen volgt:</p><ol><li>Maak de Statussen aan voor de Resultaten die u wilt toevoegen (<a href='%{link_new_status}' target='_blank'>link</a>)</li><li>Maak ten minste één Resultaat handmatig aan via dit Beheerderspaneel (<a href='%{link_new_result}' target='_blank'>link</a>) voordat u Importeren gebruikt, zodat u een beter inzicht hebt in het formaat en wat u moet invullen.</li><li>Download de Export in CSV-formaat (%{link_export_csv})</li><li>Voer de wijzigingen lokaal door. U kunt alleen de volgende kolommen van de CSV wijzigen:</li></ol><ul><li><b>category/id:</b> ID voor de Categorie</li><li><b>scope/id:</b> ID voor het Toepassingsgebied</li><li><b>parent/id:</b> ID van de hoofdwaarde (voor aanverwante resultaten). Facultatief</li><li><b>title/I18N:</b> Titel in X taal</li><li><b>description/I18N:</b> Beschrijving in X taal</li><li><b>start_date:</b> datum waarop de uitvoering van het resultaat start (formaat JJJJ-MM-DD)</li><li><b>end_date:</b> datum waarop de uitvoering van het resultaat eindigt (formaat JJJJ-MM-DD)</li><li><b>status/id:</b> ID van de status voor dit resultaat</li><li><b>progress:</b> Percentage (van 0 tot 100) van de uitvoering</li><li><b>proposals_ids:</b> intern ID van de aanverwante voorstellen (gescheiden door een komma). Het wordt automatisch omgezet in <span class='attribute-name'>proposal_url</span></li></ul>"
52
53
  link: link
53
54
  title: Importeer resultaten van CSV
54
55
  imports:
data/config/locales/no.yml CHANGED
@@ -61,10 +61,10 @@
61
61
  status:
62
62
  name: Status
63
63
  timeline_entry:
64
- name: Tidslinje oppføring
64
+ name: Oppføring i tidslinjen
65
65
  results:
66
66
  create:
67
- invalid: Det oppsto et problem med å opprette dette resultatet
67
+ invalid: Det oppstod et problem med å opprette dette resultatet
68
68
  success: Resultat ble opprettet
69
69
  destroy:
70
70
  success: Resultat ble slettet
data/config/locales/oc-FR.yml ADDED
@@ -0,0 +1 @@
1
+ oc:
data/lib/decidim/accountability/version.rb CHANGED
@@ -4,7 +4,7 @@ module Decidim
4
4
  # This holds decidim-accountability version.
5
5
  module Accountability
6
6
  def self.version
7
- "0.26.2"
7
+ "0.26.3"
8
8
  end
9
9
  end
10
10
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decidim-accountability
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.26.2
4
+ version: 0.26.3
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-29 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: decidim-comments
@@ -18,126 +18,126 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 0.26.2
21
+ version: 0.26.3
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.26.3
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.26.3
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.26.3
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: decidim-admin
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
47
  - - '='
48
48
  - !ruby/object:Gem::Version
49
- version: 0.26.2
49
+ version: 0.26.3
50
50
  type: :development
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.26.2
56
+ version: 0.26.3
57
57
  - !ruby/object:Gem::Dependency
58
58
  name: decidim-assemblies
59
59
  requirement: !ruby/object:Gem::Requirement
60
60
  requirements:
61
61
  - - '='
62
62
  - !ruby/object:Gem::Version
63
- version: 0.26.2
63
+ version: 0.26.3
64
64
  type: :development
65
65
  prerelease: false
66
66
  version_requirements: !ruby/object:Gem::Requirement
67
67
  requirements:
68
68
  - - '='
69
69
  - !ruby/object:Gem::Version
70
- version: 0.26.2
70
+ version: 0.26.3
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: decidim-comments
73
73
  requirement: !ruby/object:Gem::Requirement
74
74
  requirements:
75
75
  - - '='
76
76
  - !ruby/object:Gem::Version
77
- version: 0.26.2
77
+ version: 0.26.3
78
78
  type: :development
79
79
  prerelease: false
80
80
  version_requirements: !ruby/object:Gem::Requirement
81
81
  requirements:
82
82
  - - '='
83
83
  - !ruby/object:Gem::Version
84
- version: 0.26.2
84
+ version: 0.26.3
85
85
  - !ruby/object:Gem::Dependency
86
86
  name: decidim-dev
87
87
  requirement: !ruby/object:Gem::Requirement
88
88
  requirements:
89
89
  - - '='
90
90
  - !ruby/object:Gem::Version
91
- version: 0.26.2
91
+ version: 0.26.3
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.26.2
98
+ version: 0.26.3
99
99
  - !ruby/object:Gem::Dependency
100
100
  name: decidim-meetings
101
101
  requirement: !ruby/object:Gem::Requirement
102
102
  requirements:
103
103
  - - '='
104
104
  - !ruby/object:Gem::Version
105
- version: 0.26.2
105
+ version: 0.26.3
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.26.2
112
+ version: 0.26.3
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: decidim-participatory_processes
115
115
  requirement: !ruby/object:Gem::Requirement
116
116
  requirements:
117
117
  - - '='
118
118
  - !ruby/object:Gem::Version
119
- version: 0.26.2
119
+ version: 0.26.3
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.26.2
126
+ version: 0.26.3
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.26.2
133
+ version: 0.26.3
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.26.2
140
+ version: 0.26.3
141
141
  description: An accountability component for decidim's participatory spaces.
142
142
  email:
143
143
  - josepjaume@gmail.com
@@ -306,6 +306,7 @@ files:
306
306
  - config/locales/mt.yml
307
307
  - config/locales/nl.yml
308
308
  - config/locales/no.yml
309
+ - config/locales/oc-FR.yml
309
310
  - config/locales/om-ET.yml
310
311
  - config/locales/pl.yml
311
312
  - config/locales/pt-BR.yml