decidim-sortitions 0.28.5 → 0.29.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (27) hide show
  1. checksums.yaml +4 -4
  2. data/app/forms/decidim/sortitions/admin/destroy_sortition_form.rb +1 -1
  3. data/app/forms/decidim/sortitions/admin/edit_sortition_form.rb +1 -1
  4. data/app/forms/decidim/sortitions/admin/sortition_form.rb +2 -2
  5. data/app/helpers/decidim/sortitions/admin/sortitions_helper.rb +1 -1
  6. data/app/models/decidim/sortitions/sortition.rb +1 -1
  7. data/app/queries/decidim/sortitions/admin/participatory_space_proposals.rb +11 -18
  8. data/app/views/decidim/sortitions/admin/sortitions/index.html.erb +4 -4
  9. data/app/views/decidim/sortitions/admin/sortitions/show.html.erb +1 -1
  10. data/app/views/decidim/sortitions/sortitions/_linked_sortitions.html.erb +4 -4
  11. data/app/views/decidim/sortitions/sortitions/_sortition_author.html.erb +4 -4
  12. data/app/views/decidim/sortitions/sortitions/_sortition_cancel_author.html.erb +4 -4
  13. data/app/views/decidim/sortitions/sortitions/_tags.html.erb +1 -1
  14. data/app/views/decidim/sortitions/sortitions/show.html.erb +2 -2
  15. data/config/locales/cs.yml +0 -2
  16. data/config/locales/eu.yml +6 -6
  17. data/config/locales/fi.yml +8 -8
  18. data/config/locales/sv.yml +14 -23
  19. data/decidim-sortitions.gemspec +3 -5
  20. data/lib/decidim/api/sortition_type.rb +0 -6
  21. data/lib/decidim/api/sortitions_type.rb +3 -1
  22. data/lib/decidim/sortitions/admin_engine.rb +1 -1
  23. data/lib/decidim/sortitions/version.rb +1 -1
  24. metadata +18 -49
  25. data/app/views/decidim/sortitions/sortitions/_proposal_badge.html.erb +0 -3
  26. data/config/locales/bn-BD.yml +0 -1
  27. data/config/locales/bs-BA.yml +0 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e963203928ee01e6f5561d932b73b196f61415a01667638902c602b0960791f7
4
- data.tar.gz: fb5306035b064af0e27efe9a8b641933452d393e199a59bfcbf6069523668e36
3
+ metadata.gz: d9783e97fec8a58e1d45ae868626336d6987eb753bd0868ce2f9789ac97fa051
4
+ data.tar.gz: c187aea3fb5cbd52fba26352e451a3f3ef50f0797760c1fe2140e00689a575a4
5
5
  SHA512:
6
- metadata.gz: b6ce41784fae6a5b65a658ce54a7fc5c08e6af44da48d5f2a0ecaa3e09bd82c409be9f6c3ba044bbd5826100de863c14a2d0856ad1aa9c5fd3e897d4502f4690
7
- data.tar.gz: 1d2c94216a6613b5760fd10c4716a21a58deb7f375a4e286eda811c32171a59610c2ddd0eb244122af2691503a96572e1d6a9a4dcf293b7da72be3a56778ecf8
6
+ metadata.gz: 42dd8e23c26e7d125295afc334adf9d623ababca039818fd0ca811f59540e1c6907c8434485802a375fb7bc51fc4b05bd062cd07bf5d4d7c39603e4e1fa3693c
7
+ data.tar.gz: d6fdab6f444ecc09408232b4cc6018042a28d71de0c6d7ffc78ab91510724cd02b32a85a49dfea95c72a1458ff88b1e3776d74f92548be4465428e3f43fe1bdb
@@ -8,7 +8,7 @@ module Decidim
8
8
 
9
9
  mimic :sortition
10
10
 
11
- translatable_attribute :cancel_reason, Decidim::Attributes::RichText
11
+ translatable_attribute :cancel_reason, String
12
12
 
13
13
  validates :cancel_reason, translatable_presence: true
14
14
 
@@ -9,7 +9,7 @@ module Decidim
9
9
  mimic :sortition
10
10
 
11
11
  translatable_attribute :title, String
12
- translatable_attribute :additional_info, Decidim::Attributes::RichText
12
+ translatable_attribute :additional_info, String
13
13
 
14
14
  validates :title, translatable_presence: true
15
15
  validates :additional_info, translatable_presence: true
@@ -13,8 +13,8 @@ module Decidim
13
13
  attribute :decidim_category_id, Integer
14
14
  attribute :dice, Integer
15
15
  attribute :target_items, Integer
16
- translatable_attribute :witnesses, Decidim::Attributes::RichText
17
- translatable_attribute :additional_info, Decidim::Attributes::RichText
16
+ translatable_attribute :witnesses, String
17
+ translatable_attribute :additional_info, String
18
18
 
19
19
  validates :title, translatable_presence: true
20
20
  validates :decidim_proposals_component_id, presence: true
@@ -7,7 +7,7 @@ module Decidim
7
7
  include Decidim::TranslationsHelper
8
8
  include Decidim::PaginateHelper
9
9
 
10
- # Converst a list of components into a list of selectable options
10
+ # Converts a list of components into a list of selectable options
11
11
  def components_options(components)
12
12
  components.map do |f|
13
13
  [translated_attribute(f.name), f.id]
@@ -2,7 +2,7 @@
2
2
 
3
3
  module Decidim
4
4
  module Sortitions
5
- # Model that encapsulates the parameters of a sortion
5
+ # Model that encapsulates the parameters of a sortition
6
6
  class Sortition < ApplicationRecord
7
7
  include Decidim::Resourceable
8
8
  include Decidim::HasCategory
@@ -18,30 +18,23 @@ module Decidim
18
18
  @request_timestamp = sortition.request_timestamp
19
19
  end
20
20
 
21
- # Given a particpiatory process retrieves its proposals
21
+ # Given a participatory process retrieves its proposals
22
22
  #
23
23
  # Returns an ActiveRecord::Relation.
24
24
  def query
25
- if category.nil?
26
- return Decidim::Proposals::Proposal
27
- .except_withdrawn
28
- .published
29
- .except_rejected
30
- .not_hidden
31
- .where("decidim_proposals_proposals.created_at < ?", request_timestamp)
32
- .where(component: sortition.decidim_proposals_component)
33
- .order(id: :asc)
34
- end
25
+ proposals = Decidim::Proposals::Proposal
26
+ .not_withdrawn
27
+ .published
28
+ .not_hidden
29
+ .where("decidim_proposals_proposals.created_at < ?", request_timestamp)
30
+ .where(component: sortition.decidim_proposals_component)
31
+ proposals = proposals.where.not(id: proposals.only_status(:rejected))
32
+
33
+ return proposals.order(id: :asc) if category.nil?
35
34
 
36
35
  # categorization -> category
37
- Decidim::Proposals::Proposal
36
+ proposals
38
37
  .joins(:categorization)
39
- .except_withdrawn
40
- .published
41
- .except_rejected
42
- .not_hidden
43
- .where(component: sortition.decidim_proposals_component)
44
- .where("decidim_proposals_proposals.created_at < ?", request_timestamp)
45
38
  .where(decidim_categorizations: { decidim_category_id: category.id })
46
39
  .order(id: :asc)
47
40
  end
@@ -16,7 +16,7 @@
16
16
  <th><%= t("models.sortition.fields.reference", scope: "decidim.sortitions.admin") %></th>
17
17
  <th><%= t("models.sortition.fields.title", scope: "decidim.sortitions.admin") %></th>
18
18
  <th><%= t("models.sortition.fields.created_at", scope: "decidim.sortitions.admin") %></th>
19
- <th class="actions"></th>
19
+ <th></th>
20
20
  </tr>
21
21
  </thead>
22
22
  <tbody>
@@ -25,9 +25,9 @@
25
25
  <td><%= sortition.reference %></td>
26
26
  <td>
27
27
  <% if allowed_to? :update, :sortition, sortition: sortition %>
28
- <%= link_to decidim_html_escape(translated_attribute(sortition.title)), edit_sortition_path(sortition) %>
28
+ <%= link_to decidim_escape_translated(sortition.title), edit_sortition_path(sortition) %>
29
29
  <% else %>
30
- <%= decidim_html_escape(translated_attribute(sortition.title)) %>
30
+ <%= decidim_escape_translated(sortition.title) %>
31
31
  <% end %>
32
32
  </td>
33
33
  <td><%= l sortition.created_at, format: :short %></td>
@@ -38,7 +38,7 @@
38
38
  <span class="action-space icon"></span>
39
39
  <% end %>
40
40
 
41
- <%= icon_link_to "fullscreen-line", sortition_path(sortition), t("actions.show", scope: "decidim.sortitions.admin"), class: "action-icon--preview", target: "_blank", data: { "external-link": false } %>
41
+ <%= icon_link_to "eye-line", sortition_path(sortition), t("actions.show", scope: "decidim.sortitions.admin"), class: "action-icon--preview", target: "_blank", data: { "external-link": false } %>
42
42
 
43
43
  <%= resource_permissions_link(sortition) %>
44
44
 
@@ -2,7 +2,7 @@
2
2
  <div class="card" id="sortition">
3
3
  <div class="item_show__header">
4
4
  <h1 class="item_show__header-title">
5
- <%= decidim_html_escape(translated_attribute(sortition.title)) %>
5
+ <%= decidim_escape_translated(sortition.title) %>
6
6
  </h1>
7
7
  </div>
8
8
  <div class="table-scroll">
@@ -1,4 +1,4 @@
1
- <div class="card card--action card--list">
1
+ <div class="card card--action">
2
2
  <% resources.each do |sortition| %>
3
3
  <div class="card--list__item">
4
4
  <div class="card--list__text">
@@ -7,7 +7,7 @@
7
7
  <% end %>
8
8
  <div>
9
9
  <%= link_to resource_locator(sortition).path, class: "card__link" do %>
10
- <h5 class="card--list__heading"><%= decidim_html_escape(translated_attribute(sortition.title)) %></h5>
10
+ <h5 class="card--list__heading"><%= decidim_escape_translated(sortition.title) %></h5>
11
11
  <% end %>
12
12
  <div class="author">
13
13
  <span class="author__avatar">
@@ -19,8 +19,8 @@
19
19
  </div>
20
20
  </div>
21
21
  </div>
22
- <div class="card--list__data">
23
- <span class="card--list__data__number">
22
+ <div>
23
+ <span>
24
24
  <%= sortition.selected_proposals.size %>
25
25
  </span> <%= t(".selected_proposals", count: proposal.selected_proposals.size) %>
26
26
  </div>
@@ -1,11 +1,11 @@
1
- <div class="author-data__main">
2
- <div class="author author--inline">
3
- <span class="author__avatar author__avatar--small">
1
+ <div>
2
+ <div class="author">
3
+ <span class="author__avatar">
4
4
  <%= image_tag present(sortition.author).avatar_url %>
5
5
  </span>
6
6
  <span class="author__name">
7
7
  <% if sortition.author&.deleted? %>
8
- <span class="label label--small label--basic">
8
+ <span class="label">
9
9
  <%= t(".deleted") %>
10
10
  </span>
11
11
  <% else %>
@@ -1,11 +1,11 @@
1
- <div class="author-data__main">
2
- <div class="author author--inline">
3
- <span class="author__avatar author__avatar--small">
1
+ <div>
2
+ <div class="author">
3
+ <span class="author__avatar">
4
4
  <%= image_tag present(sortition.cancelled_by_user).avatar_url %>
5
5
  </span>
6
6
  <span class="author__name">
7
7
  <% if sortition.cancelled_by_user&.deleted? %>
8
- <span class="label label--small label--basic">
8
+ <span class="label">
9
9
  <%= t(".deleted") %>
10
10
  </span>
11
11
  <% else %>
@@ -1,4 +1,4 @@
1
- <ul class="tags tags--sortition">
1
+ <ul>
2
2
  <li>
3
3
  <%= link_to t("filters.active", scope: "decidim.sortitions.sortitions"),
4
4
  sortitions_path(filter: { with_any_state: "active" }) unless sortition.cancelled? %>
@@ -1,6 +1,6 @@
1
1
  <% add_decidim_meta_tags({
2
2
  description: decidim_sanitize_editor(translated_attribute(sortition.additional_info)),
3
- title: decidim_html_escape(translated_attribute(sortition.title)),
3
+ title: decidim_escape_translated(sortition.title),
4
4
  url: sortition_url(sortition.to_param)
5
5
  }) %>
6
6
 
@@ -21,7 +21,7 @@ edit_link(
21
21
 
22
22
  <section class="layout-main__section layout-main__heading">
23
23
  <h1 class="h1 decorator mb-4">
24
- <%= decidim_html_escape(translated_attribute(sortition.title)) %>
24
+ <%= decidim_escape_translated(sortition.title) %>
25
25
  </h1>
26
26
  <div class="layout-author">
27
27
  <%= cell "decidim/author", present(sortition.author), context_actions: [:date], from: sortition, layout: :compact %>
@@ -101,8 +101,6 @@ cs:
101
101
  cancelled: Zrušeno
102
102
  category: Kategorie
103
103
  state: Stav
104
- index:
105
- empty: Zatím zde nejsou žádné roztřídění.
106
104
  linked_sortitions:
107
105
  selected_proposals: Vybrané návrhy
108
106
  orders:
@@ -26,7 +26,7 @@ eu:
26
26
  settings:
27
27
  global:
28
28
  comments_enabled: Iruzkinak gaituta
29
- comments_max_length: Iruzkinen gehieneko luzera (utzi 0 lehenetsita konfigurazioa mantendu nahi baduzu)
29
+ comments_max_length: Iruzkinen gehieneko luzera (utzi 0 lehenetsitako konfigurazioari eusteko)
30
30
  events:
31
31
  sortitions:
32
32
  sortition_created:
@@ -75,7 +75,7 @@ eu:
75
75
  new:
76
76
  confirm: Botoia sakatzean plataformak egun eta ordua (segundu gutxi batzuk gora behera) eta dadoak botatzean ateratako zenbakia gorde egingo ditu ausazko hautaketa bat egiteko. Botoia sakatu ondoren ez dago atzera egiterik eta zozketaren emaitzak zein txantiloi honetan sartutako datuak argitaratuko dira eta ezin izango dira aldatu. Beraz, mesedez, arretaz jarraitu.
77
77
  create: Sortu
78
- title: Zozketa berria
78
+ title: Beste zozketa bat
79
79
  show:
80
80
  selected_proposals: Zozketatzeko aukeratutako proposamenak
81
81
  update:
@@ -83,14 +83,14 @@ eu:
83
83
  success: Zozketa zuzen eguneratu da.
84
84
  admin_log:
85
85
  sortition:
86
- create: "%{user_name} parte-hartzaileak %{resource_name} zozketa sortu du %{space_name} espazioan"
87
- delete: "%{user_name} parte-hartzaileak %{resource_name} zozketa bertan behera utzi du %{space_name} espazioan"
88
- update: "%{user_name} parte-hartzaileak %{resource_name} zozketa eguneratu du %{space_name} espazioan"
86
+ create: "%{user_name} k %{resource_name} zozketa sortu du %{space_name} espazioan"
87
+ delete: "%{user_name} k %{resource_name} zozketa bertan behera utzi du %{space_name} espazioan"
88
+ update: "%{user_name} k %{resource_name} zozketa eguneratu du %{space_name} espazioan"
89
89
  sortitions:
90
90
  count:
91
91
  proposals_count:
92
92
  one: proposamen 1
93
- other: "Proposamen bat"
93
+ other: "%{count} proposamen"
94
94
  filters:
95
95
  active: Aktiboak
96
96
  all: Guztiak
@@ -37,7 +37,7 @@ fi:
37
37
  sortitions:
38
38
  admin:
39
39
  actions:
40
- destroy: Peru satunnaisvalinta
40
+ destroy: Peruuta satunnaisvalinta
41
41
  edit: Muokkaa
42
42
  new_sortition: Uusi satunnaisvalinta
43
43
  show: Satunnaisvalinnan tarkemmat tiedot
@@ -55,15 +55,15 @@ fi:
55
55
  title: Otsikko
56
56
  sortitions:
57
57
  confirm_destroy:
58
- confirm_destroy: Haluatko varmasti perua tämän satunnaisvalinnan?
59
- destroy: Peru satunnaisvalinta
60
- title: Satunnaisvalinnan peruminen
58
+ confirm_destroy: Haluatko varmasti peruuttaa tämän satunnaisvalinnan?
59
+ destroy: Peruuta satunnaisvalinta
60
+ title: Satunnaisvalinnan peruuttaminen
61
61
  create:
62
62
  error: Uuden satunnaisvalinnan luonti epäonnistui.
63
63
  success: Satunnaisvalinnan luonti onnistui.
64
64
  destroy:
65
- error: Satunnaisvalintaa ei voi perua.
66
- success: Satunnaisvalinnan peruminen onnistui.
65
+ error: Satunnaisvalintaa ei voi peruuttaa.
66
+ success: Satunnaisvalinnan peruuttaminen onnistui.
67
67
  edit:
68
68
  title: Päivitä satunnaisvalinnan tiedot
69
69
  update: Päivitä
@@ -73,7 +73,7 @@ fi:
73
73
  index:
74
74
  title: Satunnaisvalinnat
75
75
  new:
76
- confirm: Kun painat painiketta, palvelin tallentaa päivämäärän ja kellonajan (sekunnin tarkkuudella) ja näitä tietoja käytetään yhdessä nopanheiton tuloksen kanssa satunnaisen valinnan luomiseen. Toimintoa ei voi perua. Kun painiketta painetaan, arvonnan tulos julkaistaan tähän lomakkeeseen syötettyjen tietojen kanssa. Tietoja ei voi muuttaa jälkikäteen, joten tarkista sisältö huolellisesti.
76
+ confirm: Kun painat painiketta, palvelin tallentaa päivämäärän ja kellonajan (sekunnin tarkkuudella) ja näitä tietoja käytetään yhdessä nopanheiton kanssa satunnaisen valinnan luomiseen. Toimintoa ei voi peruuttaa. Kun painiketta painetaan, arvonnan tulos julkaistaan tähän lomakkeeseen syötettyjen tietojen kanssa. Tietoja ei voi muuttaa jälkikäteen, joten tarkista sisältö huolellisesti.
77
77
  create: Luo
78
78
  title: Uusi satunnaisvalinta
79
79
  show:
@@ -84,7 +84,7 @@ fi:
84
84
  admin_log:
85
85
  sortition:
86
86
  create: "%{user_name} loi satunnaisvalinnan %{resource_name} kohtaan %{space_name}"
87
- delete: "%{user_name} perui satunnaisvalinnan %{resource_name} tilassa %{space_name}"
87
+ delete: "%{user_name} peruutti satunnaisvalinnan %{resource_name} kohdassa %{space_name}"
88
88
  update: "%{user_name} päivitti satunnaisvalinnan %{resource_name} kohdassa %{space_name}"
89
89
  sortitions:
90
90
  count:
@@ -3,7 +3,7 @@ sv:
3
3
  activemodel:
4
4
  attributes:
5
5
  sortition:
6
- additional_info: Information om lottningen
6
+ additional_info: Information om tilldelningen
7
7
  decidim_category_id: Kategorier för de förslag som du vill tillämpa lottningen på
8
8
  decidim_proposals_component_id: Förslagen
9
9
  dice: Tärningskast. Slå en sexsidig tärning inför vittnen, eller använd ett annat sätt att slumpmässigt skapa ett tal från 1 till 6, och skriv in resultatet. Detta bidrar till kvalitén och garanterar resultatets slumpmässighet
@@ -11,22 +11,22 @@ sv:
11
11
  title: Titel
12
12
  witnesses: Vittnen
13
13
  models:
14
- decidim/sortitions/create_sortition_event: Lottning
14
+ decidim/sortitions/create_sortition_event: Tilldelning
15
15
  activerecord:
16
16
  models:
17
17
  decidim/sortitions/sortition:
18
- one: Lottning
19
- other: Lottningar
18
+ one: Tilldelning
19
+ other: Tilldelningar
20
20
  decidim:
21
21
  components:
22
22
  sortitions:
23
23
  actions:
24
24
  comment: Kommentera
25
- name: Lottningar
25
+ name: Tilldelningar
26
26
  settings:
27
27
  global:
28
- comments_enabled: Aktivera kommentarer
29
- comments_max_length: Maximal kommentarslängd (ange 0 för att använda standardvärdet)
28
+ comments_enabled: Kommentarer aktiverade
29
+ comments_max_length: Maximal längd för kommentarer (Lämna 0 för standardvärde)
30
30
  events:
31
31
  sortitions:
32
32
  sortition_created:
@@ -39,7 +39,6 @@ sv:
39
39
  actions:
40
40
  destroy: Avbryt tilldelningen
41
41
  edit: Redigera
42
- new_sortition: Ny lottning
43
42
  show: Detaljer om tilldelningen
44
43
  models:
45
44
  sortition:
@@ -60,10 +59,6 @@ sv:
60
59
  title: Avbryta tilldelningen
61
60
  create:
62
61
  error: Det gick inte att skapa en ny tilldelning.
63
- success: Lottningen har skapats.
64
- destroy:
65
- error: Det går inte att avbryta lottningen.
66
- success: Lottningen har avbrutits.
67
62
  edit:
68
63
  title: Uppdatera informationen om tilldelningen
69
64
  update: Uppdatera
@@ -71,16 +66,14 @@ sv:
71
66
  all_categories: Alla kategorier
72
67
  select_proposal_component: Välj förslagen som ska behandlas
73
68
  index:
74
- title: Lottningar
69
+ title: Tilldelningar
75
70
  new:
76
- confirm: När du trycker på knappen Nästa registrerar Decidim datum och tid (till och med sekunder) och tillsammans med tärningskastet används denna information för att generera ett slumpmässigt val. Åtgärden är oåterkallelig. När du har tryckt på knappen publiceras resultatet av dragningen tillsammans med de uppgifter som angetts i detta formulär och kan inte ändras. Gå igenom innehållet noggrant.
77
71
  create: Skapa
78
72
  title: Ny tilldelning
79
73
  show:
80
74
  selected_proposals: Förslag som valts för lottning
81
75
  update:
82
76
  error: Det gick inte att uppdatera tilldelningen.
83
- success: Lottningen har uppdaterats.
84
77
  admin_log:
85
78
  sortition:
86
79
  create: "%{user_name} skapade tilldelningen %{resource_name} i %{space_name}"
@@ -97,8 +90,6 @@ sv:
97
90
  cancelled: Avbrutna
98
91
  category: Kategori
99
92
  state: Status
100
- index:
101
- empty: Det finns inga lottningar än.
102
93
  linked_sortitions:
103
94
  selected_proposals: Utvalda förslag
104
95
  orders:
@@ -107,8 +98,8 @@ sv:
107
98
  recent: Senaste
108
99
  results_count:
109
100
  count:
110
- one: Valt förslaget
111
- other: Valda förslag
101
+ one: valt förslaget
102
+ other: valda förslag
112
103
  show:
113
104
  algorithm: Tilldelningens algoritmkod
114
105
  any_category: från alla kategorier
@@ -116,11 +107,11 @@ sv:
116
107
  candidate_proposal_ids: Förslagens ordning och ID i tilldelningen
117
108
  candidate_proposals_info: 'Tilldelningen gjordes bland följande förslag (%{category_label}), med följande ID (de utvalda förslagen i fetstil) '
118
109
  category: från kategorin %{category}
119
- dice_result: Tärningsresultat
110
+ dice_result: (1) Tärningskast
120
111
  introduction: 'Den här sidan innehåller resultaten från tilldelningen %{reference}. Med hjälp av tilldelningen har %{target_items} resultat valts ut slumpmässigt och med lika stor sannolikhet från listan med förslag nedan. Tillsammans med resultaten, innehåller informationen på denna sida allt som krävs för att garantera och återskapa resultaten. Nyckeln till kvalitén på tilldelningen är den dubblerade slumpmässigheten från ett bevittnat tärningskast samt den exakta tiden för tilldelningen, som matas in i en algoritm som genererar det slumpmässiga urvalet. Tidsfröet för tilldelningen är så exakt (sekunder) att den är omöjlig att styras av människor, vilket ger en dubblerad "okontrollerad" indata, i syfte att att garantera ett rättvist resultat. '
121
- mathematical_result: Resultat (tärning x dragning)
112
+ mathematical_result: Resultat (1) x (2)
122
113
  proposals_selected_by_sortition: Förslag valda genom tilldelning
123
- sortition_reproducibility_details: Detaljer för att reproducera lottningens resultat
114
+ sortition_reproducibility_details: Detaljer för tilldelningens reproducerbarhet
124
115
  time_seed: (2) Tidsfrö
125
116
  witnesses: Vittnen
126
117
  sortition:
@@ -137,4 +128,4 @@ sv:
137
128
  one: 1 tilldelning
138
129
  other: "%{count} tilldelningar"
139
130
  statistics:
140
- sortitions_count: Lottningar
131
+ sortitions_count: Lottdragningar
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
8
8
  s.version = Decidim::Sortitions.version
9
9
  s.authors = ["Juan Salvador Perez Garcia"]
10
10
  s.email = ["jsperezg@gmail.com"]
11
- s.license = "AGPL-3.0-or-later"
11
+ s.license = "AGPL-3.0"
12
12
  s.homepage = "https://decidim.org"
13
13
  s.metadata = {
14
14
  "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
@@ -17,11 +17,11 @@ Gem::Specification.new do |s|
17
17
  "homepage_uri" => "https://decidim.org",
18
18
  "source_code_uri" => "https://github.com/decidim/decidim"
19
19
  }
20
- s.required_ruby_version = "~> 3.1.0"
20
+ s.required_ruby_version = "~> 3.2.0"
21
21
 
22
22
  s.name = "decidim-sortitions"
23
23
  s.summary = "Decidim sortitions module"
24
- s.description = "This module makes possible to select amont a set of proposal by sortition"
24
+ s.description = "This module makes possible to select amount a set of proposal by sortition"
25
25
 
26
26
  s.files = Dir.chdir(__dir__) do
27
27
  `git ls-files -z`.split("\x0").select do |f|
@@ -35,7 +35,5 @@ Gem::Specification.new do |s|
35
35
  s.add_dependency "decidim-core", Decidim::Sortitions.version
36
36
  s.add_dependency "decidim-proposals", Decidim::Sortitions.version
37
37
 
38
- s.add_development_dependency "decidim-assemblies", Decidim::Sortitions.version
39
38
  s.add_development_dependency "decidim-dev", Decidim::Sortitions.version
40
- s.add_development_dependency "decidim-participatory_processes", Decidim::Sortitions.version
41
39
  end
@@ -24,12 +24,6 @@ module Decidim
24
24
  field :cancelled_on, Decidim::Core::DateType, "When this sortition was cancelled", null: true
25
25
  field :cancelled_by_user, Decidim::Core::UserType, "Who cancelled this sortition", null: true
26
26
  field :candidate_proposals, [GraphQL::Types::Int, { null: true }], "The candidate proposal for this sortition", null: true
27
-
28
- def self.authorized?(object, context)
29
- context[:sortition] = object
30
-
31
- super
32
- end
33
27
  end
34
28
  end
35
29
  end
@@ -2,7 +2,9 @@
2
2
 
3
3
  module Decidim
4
4
  module Sortitions
5
- class SortitionsType < Decidim::Core::ComponentType
5
+ class SortitionsType < Decidim::Api::Types::BaseObject
6
+ implements Decidim::Core::ComponentInterface
7
+
6
8
  graphql_name "Sortitions"
7
9
  description "A sortition component of a participatory space."
8
10
 
@@ -2,7 +2,7 @@
2
2
 
3
3
  module Decidim
4
4
  module Sortitions
5
- # This is the engine that runs on the administration interface of `decidim_sorititions`.
5
+ # This is the engine that runs on the administration interface of `decidim_sortitions`.
6
6
  # It mostly handles rendering the created projects associated to a participatory
7
7
  # process.
8
8
  class AdminEngine < ::Rails::Engine
@@ -3,7 +3,7 @@
3
3
  module Decidim
4
4
  module Sortitions
5
5
  def self.version
6
- "0.28.5"
6
+ "0.29.0.rc1"
7
7
  end
8
8
  end
9
9
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decidim-sortitions
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.28.5
4
+ version: 0.29.0.rc1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juan Salvador Perez Garcia
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2025-02-12 00:00:00.000000000 Z
11
+ date: 2024-07-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: decidim-admin
@@ -16,99 +16,71 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.28.5
19
+ version: 0.29.0.rc1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.28.5
26
+ version: 0.29.0.rc1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: decidim-comments
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 0.28.5
33
+ version: 0.29.0.rc1
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 0.28.5
40
+ version: 0.29.0.rc1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: decidim-core
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - '='
46
46
  - !ruby/object:Gem::Version
47
- version: 0.28.5
47
+ version: 0.29.0.rc1
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - '='
53
53
  - !ruby/object:Gem::Version
54
- version: 0.28.5
54
+ version: 0.29.0.rc1
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: decidim-proposals
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - '='
60
60
  - !ruby/object:Gem::Version
61
- version: 0.28.5
61
+ version: 0.29.0.rc1
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - '='
67
67
  - !ruby/object:Gem::Version
68
- version: 0.28.5
69
- - !ruby/object:Gem::Dependency
70
- name: decidim-assemblies
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - '='
74
- - !ruby/object:Gem::Version
75
- version: 0.28.5
76
- type: :development
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - '='
81
- - !ruby/object:Gem::Version
82
- version: 0.28.5
68
+ version: 0.29.0.rc1
83
69
  - !ruby/object:Gem::Dependency
84
70
  name: decidim-dev
85
71
  requirement: !ruby/object:Gem::Requirement
86
72
  requirements:
87
73
  - - '='
88
74
  - !ruby/object:Gem::Version
89
- version: 0.28.5
90
- type: :development
91
- prerelease: false
92
- version_requirements: !ruby/object:Gem::Requirement
93
- requirements:
94
- - - '='
95
- - !ruby/object:Gem::Version
96
- version: 0.28.5
97
- - !ruby/object:Gem::Dependency
98
- name: decidim-participatory_processes
99
- requirement: !ruby/object:Gem::Requirement
100
- requirements:
101
- - - '='
102
- - !ruby/object:Gem::Version
103
- version: 0.28.5
75
+ version: 0.29.0.rc1
104
76
  type: :development
105
77
  prerelease: false
106
78
  version_requirements: !ruby/object:Gem::Requirement
107
79
  requirements:
108
80
  - - '='
109
81
  - !ruby/object:Gem::Version
110
- version: 0.28.5
111
- description: This module makes possible to select amont a set of proposal by sortition
82
+ version: 0.29.0.rc1
83
+ description: This module makes possible to select amount a set of proposal by sortition
112
84
  email:
113
85
  - jsperezg@gmail.com
114
86
  executables: []
@@ -155,7 +127,6 @@ files:
155
127
  - app/views/decidim/sortitions/sortitions/_count.html.erb
156
128
  - app/views/decidim/sortitions/sortitions/_linked_sortitions.html.erb
157
129
  - app/views/decidim/sortitions/sortitions/_proposal.html.erb
158
- - app/views/decidim/sortitions/sortitions/_proposal_badge.html.erb
159
130
  - app/views/decidim/sortitions/sortitions/_results_count.html.erb
160
131
  - app/views/decidim/sortitions/sortitions/_sortition.html.erb
161
132
  - app/views/decidim/sortitions/sortitions/_sortition_author.html.erb
@@ -171,8 +142,6 @@ files:
171
142
  - config/locales/ar.yml
172
143
  - config/locales/bg-BG.yml
173
144
  - config/locales/bg.yml
174
- - config/locales/bn-BD.yml
175
- - config/locales/bs-BA.yml
176
145
  - config/locales/ca.yml
177
146
  - config/locales/cs-CZ.yml
178
147
  - config/locales/cs.yml
@@ -279,7 +248,7 @@ files:
279
248
  - lib/tasks/decidim/.keep
280
249
  homepage: https://decidim.org
281
250
  licenses:
282
- - AGPL-3.0-or-later
251
+ - AGPL-3.0
283
252
  metadata:
284
253
  bug_tracker_uri: https://github.com/decidim/decidim/issues
285
254
  documentation_uri: https://docs.decidim.org/
@@ -294,14 +263,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
294
263
  requirements:
295
264
  - - "~>"
296
265
  - !ruby/object:Gem::Version
297
- version: 3.1.0
266
+ version: 3.2.0
298
267
  required_rubygems_version: !ruby/object:Gem::Requirement
299
268
  requirements:
300
- - - ">="
269
+ - - ">"
301
270
  - !ruby/object:Gem::Version
302
- version: '0'
271
+ version: 1.3.1
303
272
  requirements: []
304
- rubygems_version: 3.3.7
273
+ rubygems_version: 3.4.10
305
274
  signing_key:
306
275
  specification_version: 4
307
276
  summary: Decidim sortitions module
@@ -1,3 +0,0 @@
1
- <% if proposal.answered? %>
2
- <span class="<%= proposal_state_badge_css_class(proposal.state) %> label proposal-status"><%= humanize_proposal_state proposal.state %></span>
3
- <% end %>
@@ -1 +0,0 @@
1
- bn:
@@ -1 +0,0 @@
1
- bs: