decidim-decidim_awesome 0.12.6 → 0.13.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.
- checksums.yaml +4 -4
- data/CHANGELOG.md +10 -10
- data/README.md +3 -2
- data/Rakefile +4 -12
- data/app/cells/decidim/decidim_awesome/content_blocks/map/show.erb +1 -1
- data/app/cells/decidim/decidim_awesome/content_blocks/map_cell.rb +2 -10
- data/app/cells/decidim/decidim_awesome/content_blocks/map_form/show.erb +13 -0
- data/app/cells/decidim/decidim_awesome/voting/proposal_metadata_cell.rb +1 -1
- data/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal/show.erb +1 -1
- data/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal_cell.rb +1 -1
- data/app/commands/decidim/decidim_awesome/admin/rename_scope_label.rb +2 -0
- data/app/controllers/concerns/decidim/decidim_awesome/admin_accountability/admin/filterable.rb +2 -0
- data/app/controllers/concerns/decidim/decidim_awesome/needs_hashcash.rb +2 -3
- data/app/controllers/decidim/decidim_awesome/admin/admin_accountability_controller.rb +2 -1
- data/app/controllers/decidim/decidim_awesome/admin/custom_redirects_controller.rb +1 -1
- data/app/controllers/decidim/decidim_awesome/admin/menu_hacks_controller.rb +1 -1
- data/app/controllers/decidim/decidim_awesome/required_authorizations_controller.rb +4 -0
- data/app/forms/concerns/decidim/decidim_awesome/proposals/proposal_form_customizations_base.rb +2 -2
- data/app/forms/decidim/decidim_awesome/admin/config_form.rb +1 -1
- data/app/helpers/concerns/decidim/decidim_awesome/proposals/application_helper_override.rb +4 -4
- data/app/helpers/decidim/decidim_awesome/map_helper.rb +17 -14
- data/app/jobs/decidim/decidim_awesome/destroy_private_data_job.rb +1 -1
- data/app/jobs/decidim/decidim_awesome/export_admin_actions_job.rb +6 -2
- data/app/models/decidim/decidim_awesome/paper_trail_version.rb +21 -8
- data/app/overrides/decidim/devise/sessions/new/add_hashcash.html.erb.deface +1 -1
- data/app/overrides/decidim/proposals/proposals/_proposal_actions/limit_amendments_modal.html.erb.deface +2 -0
- data/app/overrides/decidim/proposals/proposals/_votes_count/replace_counter.html.erb.deface +1 -1
- data/app/overrides/decidim/shared/_login_modal/add_hashcash.html.erb.deface +1 -1
- data/app/packs/src/decidim/decidim_awesome/amendments/show_modal_on_limits.js +13 -10
- data/app/packs/src/decidim/decidim_awesome/awesome_map/api/fetcher.js +6 -5
- data/app/packs/src/decidim/decidim_awesome/awesome_map/api/meetings_fetcher.js +1 -1
- data/app/packs/src/decidim/decidim_awesome/awesome_map/api/proposals_fetcher.js +1 -1
- data/app/packs/src/decidim/decidim_awesome/awesome_map/awesome_map.js +12 -12
- data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/controller.js +11 -8
- data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/meetings_controller.js +1 -1
- data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/proposals_controller.js +6 -6
- data/app/packs/src/decidim/decidim_awesome/awesome_map/controls_ui.js +150 -71
- data/app/packs/src/decidim/decidim_awesome/awesome_map/load_map.js +1 -1
- data/app/packs/src/decidim/decidim_awesome/forms/autosave.js +3 -1
- data/app/packs/stylesheets/decidim/decidim_awesome/admin/admin_accountability.scss +10 -6
- data/app/packs/stylesheets/decidim/decidim_awesome/awesome_map/map.scss +39 -6
- data/app/presenters/concerns/decidim/decidim_awesome/menu_item_presenter_override.rb +1 -1
- data/app/presenters/decidim/decidim_awesome/role_base_presenter.rb +3 -1
- data/app/presenters/decidim/decidim_awesome/user_entity_presenter.rb +2 -2
- data/app/serializers/concerns/decidim/decidim_awesome/proposals/proposal_serializer_methods.rb +3 -3
- data/app/serializers/decidim/decidim_awesome/proposals/private_proposal_serializer.rb +1 -1
- data/app/validators/concerns/decidim/decidim_awesome/etiquette_validator_override.rb +10 -21
- data/app/views/decidim/decidim_awesome/admin/admin_accountability/index.html.erb +5 -8
- data/app/views/decidim/decidim_awesome/admin/custom_redirects/_form.html.erb +18 -12
- data/app/views/decidim/decidim_awesome/admin/custom_redirects/edit.html.erb +15 -11
- data/app/views/decidim/decidim_awesome/admin/custom_redirects/new.html.erb +16 -11
- data/app/views/decidim/decidim_awesome/admin/menu_hacks/index.html.erb +3 -3
- data/app/views/decidim/decidim_awesome/admin/shared/_filters_with_date.html.erb +1 -5
- data/app/views/decidim/decidim_awesome/map_component/map/_map_template.html.erb +4 -4
- data/app/views/decidim/decidim_awesome/map_component/map/show.html.erb +3 -1
- data/app/views/layouts/decidim/decidim_awesome/_awesome_config.html.erb +2 -2
- data/config/i18n-tasks.yml +1 -0
- data/config/locales/ca.yml +8 -3
- data/config/locales/cs.yml +8 -3
- data/config/locales/de.yml +8 -3
- data/config/locales/en.yml +8 -2
- data/config/locales/es.yml +8 -3
- data/config/locales/eu.yml +8 -3
- data/config/locales/fr.yml +5 -3
- data/config/locales/hu.yml +0 -3
- data/config/locales/it.yml +0 -3
- data/config/locales/ja.yml +8 -3
- data/config/locales/lt.yml +0 -1
- data/config/locales/nl.yml +0 -2
- data/config/locales/pt-BR.yml +0 -3
- data/config/locales/pt-PT.yml +0 -1
- data/config/locales/ro-RO.yml +0 -6
- data/config/locales/sv.yml +0 -2
- data/lib/decidim/decidim_awesome/checksums.yml +29 -4
- data/lib/decidim/decidim_awesome/config.rb +5 -19
- data/lib/decidim/decidim_awesome/engine.rb +11 -7
- data/lib/decidim/decidim_awesome/map_component/component.rb +2 -1
- data/lib/decidim/decidim_awesome/map_component/engine.rb +3 -2
- data/lib/decidim/decidim_awesome/menu_hacker.rb +2 -2
- data/lib/decidim/decidim_awesome/system_checker.rb +1 -4
- data/lib/decidim/decidim_awesome/test/shared_examples/admin_accountability_contexts.rb +11 -0
- data/lib/decidim/decidim_awesome/test/shared_examples/proposal_form_examples.rb +1 -2
- data/lib/decidim/decidim_awesome/test/shared_examples/scoped_admins_examples.rb +6 -4
- data/lib/decidim/decidim_awesome/version.rb +2 -2
- data/lib/tasks/decidim_awesome_migrate_menu_categories.rake +38 -0
- data/lib/tasks/decidim_awesome_upgrade_tasks.rake +4 -0
- data/package.json +7 -8
- metadata +15 -13
- data/app/overrides/decidim/proposals/proposals/_proposal_aside/limit_amendments_modal.html.erb.deface +0 -5
data/config/locales/it.yml
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
---
|
|
2
1
|
it:
|
|
3
2
|
activemodel:
|
|
4
3
|
attributes:
|
|
@@ -87,7 +86,6 @@ it:
|
|
|
87
86
|
map_zoom: Zoom (qualsiasi numero tra 0 e 18)
|
|
88
87
|
map_zoom_help: Si applica solo se è stato definito il centro della mappa
|
|
89
88
|
menu_amendments: Mostra le correzioni
|
|
90
|
-
menu_categories: Mostra Categoria nel menu di ricerca
|
|
91
89
|
menu_hashtags: Mostra menu di ricerca Hashtag
|
|
92
90
|
menu_meetings: Mostra meeting
|
|
93
91
|
menu_merge_components: Fondi tutti i componenti dello stesso tipo nel menu
|
|
@@ -469,7 +467,6 @@ it:
|
|
|
469
467
|
autosaved_error: LocalStorage non è supportato nel browser, il modulo non può essere salvato automaticamente.
|
|
470
468
|
autosaved_retrieved: I dati per questo modulo sono stati recuperati da una sessione precedente
|
|
471
469
|
autosaved_success: Dati salvati nella memoria locale
|
|
472
|
-
categories: Categorie
|
|
473
470
|
drag_and_drop_image: Aggiungi immagini trascinandole o incollandole.
|
|
474
471
|
hashtags: Hashtag
|
|
475
472
|
items: elementi
|
data/config/locales/ja.yml
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
---
|
|
2
1
|
ja:
|
|
3
2
|
active_hashcash:
|
|
4
3
|
submit_filter: フィルター
|
|
@@ -109,10 +108,12 @@ ja:
|
|
|
109
108
|
map_zoom: ズーム ( 0 と 18 の間の任意の数字)
|
|
110
109
|
map_zoom_help: 地図の中心が定義されている場合にのみ適用されます
|
|
111
110
|
menu_amendments: 修正を表示
|
|
112
|
-
menu_categories: カテゴリー検索メニューを表示
|
|
113
111
|
menu_hashtags: ハッシュタグ検索メニューの表示
|
|
114
112
|
menu_meetings: ミーティングを表示
|
|
115
113
|
menu_merge_components: 同じ種類のすべてのコンポーネントをメニューに統合します
|
|
114
|
+
menu_taxonomies: タクソノミー検索メニューを表示
|
|
115
|
+
taxonomy_filters: コンポーネントのフィルタを選択
|
|
116
|
+
taxonomy_filters_add: フィルターを追加
|
|
116
117
|
truncate: ポップアップの説明のための最大文字数
|
|
117
118
|
step:
|
|
118
119
|
announcement: アナウンス
|
|
@@ -605,6 +606,7 @@ ja:
|
|
|
605
606
|
show_not_answered: 未回答の提案を表示
|
|
606
607
|
show_rejected: 却下された提案を表示
|
|
607
608
|
show_withdrawn: 撤回された提案を表示
|
|
609
|
+
taxonomies: タクソノミー
|
|
608
610
|
text_settings: テキストの設定
|
|
609
611
|
title: タイトル
|
|
610
612
|
truncate: ポップアップの説明のための最大文字数
|
|
@@ -679,6 +681,9 @@ ja:
|
|
|
679
681
|
weight_2_short: 'Y:'
|
|
680
682
|
weight_3: 緑
|
|
681
683
|
weight_3_short: 'G:'
|
|
684
|
+
download_your_data:
|
|
685
|
+
show:
|
|
686
|
+
admin_actions: 管理者の操作
|
|
682
687
|
meetings:
|
|
683
688
|
meetings_map:
|
|
684
689
|
view_meeting: ミーティングを表示
|
|
@@ -709,10 +714,10 @@ ja:
|
|
|
709
714
|
autosaved_error: お使いのブラウザーではLocalStorageをサポートしていないため、フォームは自動保存されません。
|
|
710
715
|
autosaved_retrieved: このフォームのデータは前回のセッションから復元しました
|
|
711
716
|
autosaved_success: ローカルストレージにデータを保存しました
|
|
712
|
-
categories: カテゴリー
|
|
713
717
|
drag_and_drop_image: ドラッグ&ドロップで画像を追加できます
|
|
714
718
|
hashtags: ハッシュタグ
|
|
715
719
|
items: 項目
|
|
716
720
|
meetings: ミーティング
|
|
717
721
|
proposals: 提案
|
|
718
722
|
select_deselect_all: まとめて選択・選択解除する
|
|
723
|
+
taxonomies: タクソノミー
|
data/config/locales/lt.yml
CHANGED
data/config/locales/nl.yml
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
---
|
|
2
1
|
nl:
|
|
3
2
|
activemodel:
|
|
4
3
|
attributes:
|
|
@@ -236,7 +235,6 @@ nl:
|
|
|
236
235
|
autosaved_error: LocalStorage wordt niet ondersteund in uw browser, formulier kan niet automatisch worden opgeslagen.
|
|
237
236
|
autosaved_retrieved: Gegevens voor dit formulier zijn hersteld van een vorige sessie
|
|
238
237
|
autosaved_success: Data opgeslagen in lokale opslag
|
|
239
|
-
categories: Categorieën
|
|
240
238
|
drag_and_drop_image: Voeg afbeeldingen toe door ze te slepen, te plaatsen of te plakken.
|
|
241
239
|
hashtags: Hashtags
|
|
242
240
|
items: items
|
data/config/locales/pt-BR.yml
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
---
|
|
2
1
|
pt-BR:
|
|
3
2
|
activemodel:
|
|
4
3
|
attributes:
|
|
@@ -63,7 +62,6 @@ pt-BR:
|
|
|
63
62
|
map_zoom: Zoom (qualquer número entre 0 e 18)
|
|
64
63
|
map_zoom_help: Só se aplica se um centro de mapa estiver definido
|
|
65
64
|
menu_amendments: Mostrar emendas
|
|
66
|
-
menu_categories: Mostrar menu de pesquisa de categora
|
|
67
65
|
menu_meetings: Mostrar reuniões
|
|
68
66
|
menu_merge_components: Mesclar todos os componentes do mesmo tipo no menu
|
|
69
67
|
truncate: Máximo de caracteres para descrições em popup
|
|
@@ -345,7 +343,6 @@ pt-BR:
|
|
|
345
343
|
autosaved_error: O armazenamento local não é suportado no seu navegador, o formulário não pode ser salvo automaticamente.
|
|
346
344
|
autosaved_retrieved: Os dados para este formulário foram recuperados de uma sessão anterior
|
|
347
345
|
autosaved_success: Dados salvos no armazenamento local
|
|
348
|
-
categories: Categorias
|
|
349
346
|
drag_and_drop_image: Adicione imagens arrastando e soltando ou colando-as.
|
|
350
347
|
hashtags: Hashtags
|
|
351
348
|
items: itens
|
data/config/locales/pt-PT.yml
CHANGED
data/config/locales/ro-RO.yml
CHANGED
data/config/locales/sv.yml
CHANGED
|
@@ -3,13 +3,13 @@ decidim-admin:
|
|
|
3
3
|
decidim-0.29.1: b2ae319d5bcf43954bbe0edb9a4e3ffb
|
|
4
4
|
decidim-assemblies:
|
|
5
5
|
/app/views/decidim/assemblies/admin/assemblies/_form.html.erb:
|
|
6
|
-
decidim-0.29.4:
|
|
6
|
+
decidim-0.29.4: cf28844ddb8416aedb934d526462fbc0
|
|
7
7
|
decidim-participatory_processes:
|
|
8
8
|
/app/views/decidim/participatory_processes/admin/participatory_processes/_form.html.erb:
|
|
9
|
-
decidim-0.29.4:
|
|
9
|
+
decidim-0.29.4: 3eca01ab87a77deec7443bbecee93a15
|
|
10
10
|
decidim-conferences:
|
|
11
11
|
/app/views/decidim/conferences/admin/conferences/_form.html.erb:
|
|
12
|
-
decidim-0.29.4:
|
|
12
|
+
decidim-0.29.4: 068ebba1590111b40f50923b33f57313
|
|
13
13
|
decidim-core:
|
|
14
14
|
/app/packs/entrypoints/decidim_editor.js:
|
|
15
15
|
decidim-0.29.1: beddd77e3893fd0b7cd2679a7ee6e536
|
|
@@ -17,6 +17,7 @@ decidim-core:
|
|
|
17
17
|
decidim-0.29.1: 90dfac3acae97202dec083955e2249e4
|
|
18
18
|
/app/validators/etiquette_validator.rb:
|
|
19
19
|
decidim-0.29.1: e9ad91d824ad48ac2075a088a0d21349
|
|
20
|
+
decidim-0.30.0: 7a1d9f32067ca169610d4c03b97d7b0d
|
|
20
21
|
/app/views/layouts/decidim/_head.html.erb:
|
|
21
22
|
decidim-0.29.1: 8ac1af4e223d9a7a98136760b6194a75
|
|
22
23
|
decidim-0.29.2: 59abccd8b1c5315d5c0b772be0c26d45
|
|
@@ -28,65 +29,89 @@ decidim-core:
|
|
|
28
29
|
decidim-0.29.1: f04f0f5112499a86079119d5f9ae8487
|
|
29
30
|
/app/helpers/decidim/amendments_helper.rb:
|
|
30
31
|
decidim-0.29.1: 36072334cba7a58841a6b2fb007d24a6
|
|
31
|
-
decidim-0.
|
|
32
|
+
decidim-0.30.0: 30791e6637dedd413cdc037206726c2f
|
|
32
33
|
/app/presenters/decidim/admin_log/component_presenter.rb:
|
|
33
34
|
decidim-0.29.1: 77e80d527727acdf117a0c4517a69a7c
|
|
35
|
+
decidim-0.30.0: 0bfbd6771f52884a224f8e947ab15839
|
|
34
36
|
/app/forms/decidim/account_form.rb:
|
|
35
37
|
decidim-0.29.1: 11a022ae6ae18ad89da168bec4207935
|
|
36
38
|
decidim-0.29.3: 5872f17965919c0754a453ac4eb614df
|
|
37
39
|
/app/commands/decidim/update_account.rb:
|
|
38
40
|
decidim-0.29.1: d24090fdd9358c38e6e15c4607a78e18
|
|
41
|
+
decidim-0.30.0: f6c1fbdfd2e2c38bd9b6a43b335df975
|
|
39
42
|
/app/views/decidim/account/show.html.erb:
|
|
40
43
|
decidim-0.29.1: f13218e2358a2d611996c2a197c0de25
|
|
41
44
|
/app/cells/decidim/content_blocks/global_menu_cell.rb:
|
|
42
45
|
decidim-0.28.0: d224370c364a9cf4b2e244063274e5ef
|
|
43
46
|
/app/views/decidim/devise/registrations/new.html.erb:
|
|
44
47
|
decidim-0.29.1: b30423406afd43bb9af2c98d59d43632
|
|
48
|
+
decidim-0.30.0: 56884184f7f1582828a77fbeff2bb546
|
|
45
49
|
/app/views/decidim/devise/sessions/new.html.erb:
|
|
46
50
|
decidim-0.29.1: a8fe60cd10c1636822c252d5488a979d
|
|
51
|
+
decidim-0.30.0: da0d18178c8dcead2774956e989527c5
|
|
47
52
|
/app/views/decidim/shared/_login_modal.html.erb:
|
|
48
53
|
decidim-0.29.1: 0d615603bb45f7b209032578dda9fc72
|
|
54
|
+
decidim-0.30.0: 98bd2832be207d7abcd48d2a0ba40bd0
|
|
49
55
|
decidim-proposals:
|
|
50
56
|
/lib/decidim/proposals/proposal_serializer.rb:
|
|
51
57
|
decidim-0.29.1: 58915ff3a7528463587d3762a93ff51b
|
|
52
58
|
decidim-0.29.2: f52f5770d8596134624ecb79457a21de
|
|
59
|
+
decidim-0.30.0: 7e42fe689432706c6abbd832b9e3d3c3
|
|
53
60
|
/lib/decidim/api/proposal_type.rb:
|
|
54
61
|
decidim-0.29.1: 25d61a67a4b969ac8c472237d3f64b66
|
|
55
62
|
decidim-0.29.2: cd24561962f6fb6038678795f60bdec3
|
|
63
|
+
decidim-0.30.0: 3b9dd9c3afc8ee0c9a7bb1e46c865a60
|
|
56
64
|
/app/forms/decidim/proposals/proposal_form.rb:
|
|
57
65
|
decidim-0.29.1: 0b19bfeb4f7bd15cd378a69c3935de6b
|
|
58
66
|
decidim-0.29.2: ad4ff4bde6ee2e802d394382ef7859a4
|
|
67
|
+
decidim-0.30.0: 8db839481fec2a53acecabbf22377aa6
|
|
59
68
|
/app/forms/decidim/proposals/admin/proposal_form.rb:
|
|
60
69
|
decidim-0.29.1: 422632395194b19beed4c7c65f127ff5
|
|
61
70
|
decidim-0.29.2: ad4ff4bde6ee2e802d394382ef7859a4
|
|
71
|
+
decidim-0.30.0: 34e42ec6c9911b60c28d2bb49f066a8c
|
|
62
72
|
/app/helpers/decidim/proposals/application_helper.rb:
|
|
63
73
|
decidim-0.29.1: 940488938f644b63a2ef6177f3757ca2
|
|
64
74
|
decidim-0.29.3: e6039a99268845c5038f913309fde432
|
|
75
|
+
decidim-0.30.0: e539b6feb12c515ec24ed6d3efd6e29e
|
|
65
76
|
/app/controllers/decidim/proposals/proposal_votes_controller.rb:
|
|
66
77
|
decidim-0.29.1: f983e72c1ee8d31222d537533c762cd2
|
|
67
78
|
/app/views/decidim/proposals/admin/proposals/_form.html.erb:
|
|
68
79
|
decidim-0.29.1: 667c2ef6ffbf3369f59bd1e8eb0ba421
|
|
69
80
|
decidim-0.29.3: 59a7ed11d05a633cd4bf23881254b7f1
|
|
81
|
+
decidim-0.30.0: bbf9f55b307e6ba22a70289712bc019b
|
|
82
|
+
decidim-0.30.1: 7619190e4de00729893f62bce180a8e5
|
|
70
83
|
/app/views/decidim/proposals/proposals/_vote_button.html.erb:
|
|
71
84
|
decidim-0.29.1: 06dd4c9bf7fc4953fc330b7ba081b2f6
|
|
85
|
+
decidim-0.30.0: 644e8d24ad9571939e150190443b054a
|
|
86
|
+
decidim-0.30.1: 3cd74a9396d20e19ed3821f08cbe2b06
|
|
72
87
|
/app/views/decidim/proposals/proposals/_votes_count.html.erb:
|
|
73
88
|
decidim-0.29.1: 6e663e5c82c27291b63f29f346df8737
|
|
89
|
+
decidim-0.30.0: 6af6cdeeff0fc0daad028b88ee1c21cb
|
|
74
90
|
/app/cells/decidim/proposals/proposal_l_cell.rb:
|
|
75
91
|
decidim-0.29.1: e38d1cd0ea6c7f14c8f8b56d3ceb0db5
|
|
76
92
|
decidim-0.29.2: 5043d8560a26fce2e296b3a0f6ba6cf6
|
|
93
|
+
decidim-0.30.0: 682349209dad2f878f4d996a6c2b0bab
|
|
77
94
|
/app/cells/decidim/proposals/proposal_metadata_cell.rb:
|
|
78
95
|
decidim-0.29.1: 6859b77805227c4cf71ae0a1351a4551
|
|
96
|
+
decidim-0.30.0: 04239cfbbd8defc21f85bbd533e2d1a6
|
|
79
97
|
/app/commands/decidim/proposals/create_proposal.rb:
|
|
80
98
|
decidim-0.29.1: 02a6f54a032457e68be580e6a539c47b
|
|
99
|
+
decidim-0.30.0: e754afeca5167e04e40b856999667706
|
|
81
100
|
/app/commands/decidim/proposals/create_collaborative_draft.rb:
|
|
82
101
|
decidim-0.29.1: ab3f937f15c6ed945e776fef34b18abf
|
|
102
|
+
decidim-0.30.0: 64fb896383da98334648ce607dde0a27
|
|
83
103
|
/app/commands/decidim/proposals/admin/create_proposal.rb:
|
|
84
104
|
decidim-0.29.1: 837d86d2eb1f2d7579a0cef82d68caf7
|
|
105
|
+
decidim-0.30.0: 6d3daa0339abd4cc07859292dda319bb
|
|
85
106
|
/app/commands/decidim/proposals/update_proposal.rb:
|
|
86
107
|
decidim-0.29.1: e81268a1f9b3770387944d44d7704291
|
|
108
|
+
decidim-0.30.0: 2dcc14554207bbe287897543728a4d4d
|
|
87
109
|
/app/commands/decidim/proposals/update_collaborative_draft.rb:
|
|
88
110
|
decidim-0.29.1: 7df5266382bd57db72832da391fe7e11
|
|
111
|
+
decidim-0.30.0: 21b0546e5ea23b251cab3f9403732af6
|
|
89
112
|
/app/commands/decidim/proposals/admin/update_proposal.rb:
|
|
90
113
|
decidim-0.29.1: 67b691b6d1ce61cb198592ac25f76f74
|
|
114
|
+
decidim-0.30.0: d41045482929b4a561186d31a71666c4
|
|
91
115
|
/app/presenters/decidim/proposals/proposal_presenter.rb:
|
|
92
116
|
decidim-0.29.1: bbc7cee02125c1f8cf909219e48af337
|
|
117
|
+
decidim-0.30.0: b12cfb5e55aff4756d757e71e580c547
|
|
@@ -7,7 +7,6 @@ module Decidim
|
|
|
7
7
|
def initialize(organization)
|
|
8
8
|
@organization = organization
|
|
9
9
|
@vars = AwesomeConfig.for_organization(organization).includes(:constraints)
|
|
10
|
-
@saved_vars = @vars.map(&:var).map(&:to_sym)
|
|
11
10
|
@context = {
|
|
12
11
|
participatory_space_manifest: nil,
|
|
13
12
|
participatory_space_slug: nil,
|
|
@@ -18,7 +17,7 @@ module Decidim
|
|
|
18
17
|
@sub_configs = {}
|
|
19
18
|
end
|
|
20
19
|
|
|
21
|
-
attr_reader :context, :organization, :vars, :application_context
|
|
20
|
+
attr_reader :context, :organization, :vars, :application_context
|
|
22
21
|
attr_writer :defaults
|
|
23
22
|
|
|
24
23
|
def defaults
|
|
@@ -76,7 +75,7 @@ module Decidim
|
|
|
76
75
|
valid = @vars.to_h { |v| [v.var.to_sym, v.value] }
|
|
77
76
|
|
|
78
77
|
map_defaults do |key, val|
|
|
79
|
-
valid
|
|
78
|
+
valid.has_key?(key) ? valid[key] : val
|
|
80
79
|
end
|
|
81
80
|
end
|
|
82
81
|
|
|
@@ -87,11 +86,6 @@ module Decidim
|
|
|
87
86
|
)
|
|
88
87
|
end
|
|
89
88
|
|
|
90
|
-
# Checks if some var has been configured for the organization (not using defaults)
|
|
91
|
-
def saved?(var)
|
|
92
|
-
@saved_vars.include?(var.to_sym)
|
|
93
|
-
end
|
|
94
|
-
|
|
95
89
|
# Checks if some config setting is enabled in a certain context
|
|
96
90
|
def enabled_in_context?(setting)
|
|
97
91
|
config[setting]
|
|
@@ -178,18 +172,10 @@ module Decidim
|
|
|
178
172
|
end
|
|
179
173
|
end
|
|
180
174
|
|
|
181
|
-
# calculates the config according to the current context
|
|
182
|
-
# - if some var is not valid in the current context, it will be nil
|
|
183
|
-
# Certain keys may want to know if this is a legit value or it is simply not valid in the current context
|
|
184
|
-
# Fot that, use the saved?(var) method
|
|
185
175
|
def calculate_config
|
|
186
|
-
#
|
|
187
|
-
valid = @vars.
|
|
188
|
-
|
|
189
|
-
item.var.to_sym,
|
|
190
|
-
enabled_for_organization?(item.var) && valid_in_context?(item.all_constraints) ? item.value : nil
|
|
191
|
-
]
|
|
192
|
-
end
|
|
176
|
+
# filter vars compliant with current context
|
|
177
|
+
valid = @vars.filter { |item| enabled_for_organization?(item.var) && valid_in_context?(item.all_constraints) }
|
|
178
|
+
.to_h { |v| [v.var.to_sym, v.value] }
|
|
193
179
|
|
|
194
180
|
map_defaults do |key, val|
|
|
195
181
|
valid.has_key?(key) ? valid[key] : val
|
|
@@ -38,12 +38,14 @@ module Decidim
|
|
|
38
38
|
Decidim::ViewModel.include(Decidim::DecidimAwesome::AwesomeHelpers)
|
|
39
39
|
|
|
40
40
|
# Override EtiquetteValidator
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
41
|
+
if DecidimAwesome.enabled?(:validate_title_max_caps_percent,
|
|
42
|
+
:validate_title_max_marks_together,
|
|
43
|
+
:validate_title_start_with_caps,
|
|
44
|
+
:validate_body_max_caps_percent,
|
|
45
|
+
:validate_body_max_marks_together,
|
|
46
|
+
:validate_body_start_with_caps)
|
|
47
|
+
EtiquetteValidator.include(Decidim::DecidimAwesome::EtiquetteValidatorOverride)
|
|
48
|
+
end
|
|
47
49
|
|
|
48
50
|
# Custom fields need to deal with several places
|
|
49
51
|
if DecidimAwesome.enabled?(:proposal_custom_fields,
|
|
@@ -111,7 +113,7 @@ module Decidim
|
|
|
111
113
|
|
|
112
114
|
# Late registering of components to take into account initializer values
|
|
113
115
|
DecidimAwesome.registered_components.each do |manifest, block|
|
|
114
|
-
next if DecidimAwesome.disabled_components
|
|
116
|
+
next if DecidimAwesome.disabled_components.include?(manifest)
|
|
115
117
|
next if Decidim.find_component_manifest(manifest)
|
|
116
118
|
|
|
117
119
|
Decidim.register_component(manifest, &block)
|
|
@@ -227,7 +229,9 @@ module Decidim
|
|
|
227
229
|
voting.proposal_metadata_cell = "decidim/decidim_awesome/voting/proposal_metadata"
|
|
228
230
|
voting.weight_validator do |weight, context|
|
|
229
231
|
allowed = [1, 2, 3]
|
|
232
|
+
# rubocop:disable Style/SafeNavigationChainLength
|
|
230
233
|
allowed << 0 if context[:proposal]&.component&.settings&.voting_cards_show_abstain
|
|
234
|
+
# rubocop:enable Style/SafeNavigationChainLength
|
|
231
235
|
weight.in? allowed
|
|
232
236
|
end
|
|
233
237
|
end
|
|
@@ -22,9 +22,10 @@ Decidim::DecidimAwesome.register_component(:awesome_map) do |component|
|
|
|
22
22
|
settings.attribute :collapse, type: :boolean, default: false
|
|
23
23
|
settings.attribute :menu_amendments, type: :boolean, default: true
|
|
24
24
|
settings.attribute :menu_meetings, type: :boolean, default: true
|
|
25
|
-
settings.attribute :
|
|
25
|
+
settings.attribute :menu_taxonomies, type: :boolean, default: true
|
|
26
26
|
settings.attribute :menu_hashtags, type: :boolean, default: true
|
|
27
27
|
settings.attribute :menu_merge_components, type: :boolean, default: false
|
|
28
|
+
settings.attribute :taxonomy_filters, type: :taxonomy_filters
|
|
28
29
|
end
|
|
29
30
|
|
|
30
31
|
component.settings(:step) do |settings|
|
|
@@ -16,7 +16,7 @@ module Decidim
|
|
|
16
16
|
|
|
17
17
|
initializer "decidim_decidim_awesome.content_blocks" do |_app|
|
|
18
18
|
# do not register this if awesome_map is disabled
|
|
19
|
-
next if DecidimAwesome.disabled_components
|
|
19
|
+
next if DecidimAwesome.disabled_components.include?(:awesome_map)
|
|
20
20
|
|
|
21
21
|
# === Home Map block ===
|
|
22
22
|
Decidim.content_blocks.register(:homepage, :awesome_map) do |content_block|
|
|
@@ -35,7 +35,7 @@ module Decidim
|
|
|
35
35
|
settings.attribute :menu_amendments, type: :boolean, default: true
|
|
36
36
|
settings.attribute :menu_meetings, type: :boolean, default: true
|
|
37
37
|
settings.attribute :menu_hashtags, type: :boolean, default: true
|
|
38
|
-
settings.attribute :
|
|
38
|
+
settings.attribute :menu_taxonomies, type: :boolean, default: true
|
|
39
39
|
settings.attribute :menu_merge_components, type: :boolean, default: true
|
|
40
40
|
|
|
41
41
|
settings.attribute :show_not_answered, type: :boolean, default: true
|
|
@@ -43,6 +43,7 @@ module Decidim
|
|
|
43
43
|
settings.attribute :show_withdrawn, type: :boolean, default: false
|
|
44
44
|
settings.attribute :show_evaluating, type: :boolean, default: true
|
|
45
45
|
settings.attribute :show_rejected, type: :boolean, default: false
|
|
46
|
+
settings.attribute :taxonomy_ids, type: :array, default: []
|
|
46
47
|
end
|
|
47
48
|
end
|
|
48
49
|
# === TODO: processes groups map block ===
|
|
@@ -20,7 +20,7 @@ module Decidim
|
|
|
20
20
|
menu_overrides.each do |item|
|
|
21
21
|
default = default_items.find { |i| i.url.gsub(/\?.*/, "") == item.url }
|
|
22
22
|
if default
|
|
23
|
-
item.send("
|
|
23
|
+
item.send("overrided?=", true)
|
|
24
24
|
item[:original_active] = default.active
|
|
25
25
|
@items.reject! { |i| i.url.gsub(/\?.*/, "") == item.url }
|
|
26
26
|
end
|
|
@@ -58,7 +58,7 @@ module Decidim
|
|
|
58
58
|
visibility: item["visibility"],
|
|
59
59
|
visible?: visible?(item),
|
|
60
60
|
target: item["target"],
|
|
61
|
-
|
|
61
|
+
overrided?: false
|
|
62
62
|
)
|
|
63
63
|
end
|
|
64
64
|
end
|
|
@@ -11,10 +11,7 @@ module Decidim
|
|
|
11
11
|
|
|
12
12
|
# rubocop:disable Rails/DynamicFindBy
|
|
13
13
|
checksums = YAML.load_file("#{__dir__}/checksums.yml")
|
|
14
|
-
|
|
15
|
-
@overrides = checksums.filter_map do |package, files|
|
|
16
|
-
next unless Decidim::DependencyResolver.instance.needed?(package)
|
|
17
|
-
|
|
14
|
+
@overrides = checksums.map do |package, files|
|
|
18
15
|
props = {
|
|
19
16
|
spec: ::Gem::Specification.find_by_name(package),
|
|
20
17
|
files: files.transform_values(&:values)
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
shared_context "with admin accountability helpers" do
|
|
4
|
+
def search_by_date(start_date, end_date)
|
|
5
|
+
within(".filters__section") do
|
|
6
|
+
fill_in_datepicker :q_created_at_gteq_date, with: start_date.strftime("%d/%m/%Y") if start_date.present?
|
|
7
|
+
fill_in_datepicker :q_created_at_lteq_date, with: end_date.strftime("%d/%m/%Y") if end_date.present?
|
|
8
|
+
find("*[type=submit]").click
|
|
9
|
+
end
|
|
10
|
+
end
|
|
11
|
+
end
|
|
@@ -40,7 +40,6 @@ shared_context "with a custom fields enabled" do
|
|
|
40
40
|
let!(:private_constraint) { create(:config_constraint, awesome_config: private_config_helper, settings: { "participatory_space_manifest" => "participatory_processes" }) }
|
|
41
41
|
let(:slug) { participatory_space.slug }
|
|
42
42
|
end
|
|
43
|
-
|
|
44
43
|
shared_examples "starts with caps" do |prop|
|
|
45
44
|
let!(:config) { create(:awesome_config, organization:, var: "validate_#{prop}_start_with_caps", value: enabled) }
|
|
46
45
|
let!(:constraint) do
|
|
@@ -139,7 +138,7 @@ shared_examples "max caps percent" do |prop|
|
|
|
139
138
|
context "when scoped under different context" do
|
|
140
139
|
let(:slug) { "another-slug" }
|
|
141
140
|
|
|
142
|
-
it_behaves_like "invalid percentage",
|
|
141
|
+
it_behaves_like "invalid percentage", 25
|
|
143
142
|
|
|
144
143
|
context "when has less than 25% caps" do
|
|
145
144
|
let(prop.to_sym) { "Í only have some CÁPS" }
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
2
|
|
|
3
|
+
welcome_text = "Dashboard"
|
|
4
|
+
|
|
3
5
|
shared_examples "redirects to index" do |_link|
|
|
4
6
|
it "display index page" do
|
|
5
7
|
expect(page).to have_content("You are not authorized to perform this action")
|
|
6
|
-
expect(page).to have_content(
|
|
8
|
+
expect(page).to have_content(welcome_text)
|
|
7
9
|
expect(page).to have_current_path(decidim_admin.root_path, ignore_query: true)
|
|
8
10
|
end
|
|
9
11
|
end
|
|
@@ -109,12 +111,12 @@ shared_examples "allows all admin routes" do
|
|
|
109
111
|
visit decidim_admin.root_path
|
|
110
112
|
# this is a workaround to wait for the page to load
|
|
111
113
|
# it seems that the test might fail randomly otherwise
|
|
112
|
-
#
|
|
114
|
+
# underlaying issue is unknown, maybe capybara is faster clicking than ruby is at storing class variables?
|
|
113
115
|
sleep 0.1
|
|
114
116
|
end
|
|
115
117
|
|
|
116
118
|
it "allows the admin root page" do
|
|
117
|
-
expect(page).to have_content(
|
|
119
|
+
expect(page).to have_content(welcome_text)
|
|
118
120
|
end
|
|
119
121
|
|
|
120
122
|
it "allows the assemblies page" do
|
|
@@ -136,7 +138,7 @@ shared_examples "allows scoped admin routes" do
|
|
|
136
138
|
end
|
|
137
139
|
|
|
138
140
|
it "allows the admin root page" do
|
|
139
|
-
expect(page).to have_content(
|
|
141
|
+
expect(page).to have_content(welcome_text)
|
|
140
142
|
end
|
|
141
143
|
|
|
142
144
|
it "allows the assemblies page" do
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
# frozen_string_literal: true
|
|
2
|
+
|
|
3
|
+
namespace :decidim_decidim_awesome do
|
|
4
|
+
namespace :upgrade do
|
|
5
|
+
desc "Migrate menu_categories to menu_taxonomies in awesome_map components"
|
|
6
|
+
task migrate_awesome_map_menu_categories_to_menu_taxonomies: :environment do
|
|
7
|
+
components_to_migrate = Decidim::Component.where(manifest_name: "awesome_map")
|
|
8
|
+
.where("settings->'global' ? 'menu_categories'")
|
|
9
|
+
|
|
10
|
+
next if components_to_migrate.empty?
|
|
11
|
+
|
|
12
|
+
puts "Starting migration of menu_categories to menu_taxonomies in awesome_map components..."
|
|
13
|
+
puts "Found #{components_to_migrate.count} components to migrate."
|
|
14
|
+
|
|
15
|
+
updated_count = 0
|
|
16
|
+
|
|
17
|
+
components_to_migrate.find_each do |component|
|
|
18
|
+
raw_settings = component.read_attribute(:settings)
|
|
19
|
+
|
|
20
|
+
if raw_settings&.dig("global")&.has_key?("menu_categories")
|
|
21
|
+
menu_categories_value = raw_settings["global"]["menu_categories"]
|
|
22
|
+
|
|
23
|
+
raw_settings["global"].delete("menu_categories")
|
|
24
|
+
raw_settings["global"]["menu_taxonomies"] = menu_categories_value
|
|
25
|
+
|
|
26
|
+
component.update_column(:settings, raw_settings) # rubocop:disable Rails/SkipsModelValidations
|
|
27
|
+
|
|
28
|
+
updated_count += 1
|
|
29
|
+
|
|
30
|
+
puts "Updated component ID: #{component.id}"
|
|
31
|
+
puts " Changed menu_categories: #{menu_categories_value} -> menu_taxonomies: #{menu_categories_value}"
|
|
32
|
+
end
|
|
33
|
+
end
|
|
34
|
+
|
|
35
|
+
puts "Migration completed. Updated #{updated_count} components."
|
|
36
|
+
end
|
|
37
|
+
end
|
|
38
|
+
end
|
|
@@ -10,3 +10,7 @@ Rake::Task["decidim:choose_target_plugins"].enhance do
|
|
|
10
10
|
ENV["FROM"] = "#{ENV.fetch("FROM", nil)},active_hashcash" if Decidim::DecidimAwesome.enabled?(:hashcash_signup, :hashcash_login)
|
|
11
11
|
end
|
|
12
12
|
end
|
|
13
|
+
|
|
14
|
+
Rake::Task["decidim_decidim_awesome:install:migrations"].enhance do
|
|
15
|
+
Rake::Task["decidim_decidim_awesome:upgrade:migrate_awesome_map_menu_categories_to_menu_taxonomies"].invoke
|
|
16
|
+
end
|
data/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "decidim-module-decidim_awesome",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.13.1",
|
|
4
4
|
"description": "Mods and tweaks for Decidim",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"directories": {
|
|
@@ -34,11 +34,11 @@
|
|
|
34
34
|
},
|
|
35
35
|
"prettier": "@decidim/prettier-config",
|
|
36
36
|
"devDependencies": {
|
|
37
|
-
"@decidim/dev": "0.
|
|
38
|
-
"@decidim/eslint-config": "0.
|
|
39
|
-
"@decidim/prettier-config": "0.
|
|
40
|
-
"@decidim/stylelint-config": "0.
|
|
41
|
-
"
|
|
37
|
+
"@decidim/dev": "0.30.0",
|
|
38
|
+
"@decidim/eslint-config": "0.30.0",
|
|
39
|
+
"@decidim/prettier-config": "0.30.0",
|
|
40
|
+
"@decidim/stylelint-config": "0.30.0",
|
|
41
|
+
"@decidim/webpacker": "0.30.0"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
44
|
"codemirror": "^5.65.16",
|
|
@@ -47,7 +47,6 @@
|
|
|
47
47
|
"formbuilder-languages": "^1.2.0",
|
|
48
48
|
"inline-attacher": "^0.0.7",
|
|
49
49
|
"jsrender": "^1.0.9",
|
|
50
|
-
"leaflet.featuregroup.subgroup": "^1.0.2"
|
|
51
|
-
"tom-select": "2.2.2"
|
|
50
|
+
"leaflet.featuregroup.subgroup": "^1.0.2"
|
|
52
51
|
}
|
|
53
52
|
}
|