decidim-decidim_awesome 0.12.4 → 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 +21 -1
- 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 -2
- 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/required_authorizations_controller.rb +4 -0
- 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/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/decidim/decidim_awesome/role_base_presenter.rb +3 -1
- data/app/presenters/decidim/decidim_awesome/user_entity_presenter.rb +2 -2
- data/app/queries/decidim/decidim_awesome/space_constraint_finder.rb +2 -0
- 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 +21 -3
- 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/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 -2
- data/config/locales/cs.yml +8 -2
- data/config/locales/de.yml +8 -2
- data/config/locales/en.yml +8 -2
- data/config/locales/es.yml +8 -2
- data/config/locales/eu.yml +105 -30
- data/config/locales/fr.yml +72 -2
- data/config/locales/hu.yml +0 -2
- data/config/locales/it.yml +0 -2
- data/config/locales/ja.yml +8 -2
- data/config/locales/nl.yml +0 -1
- data/config/locales/pt-BR.yml +0 -2
- data/config/locales/ro-RO.yml +0 -5
- data/config/locales/sv.yml +0 -1
- data/lib/decidim/decidim_awesome/checksums.yml +29 -3
- data/lib/decidim/decidim_awesome/engine.rb +10 -6
- data/lib/decidim/decidim_awesome/map_component/component.rb +2 -1
- data/lib/decidim/decidim_awesome/map_component/engine.rb +2 -1
- data/lib/decidim/decidim_awesome/test/shared_examples/admin_accountability_contexts.rb +11 -0
- 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/ja.yml
CHANGED
|
@@ -108,10 +108,12 @@ ja:
|
|
|
108
108
|
map_zoom: ズーム ( 0 と 18 の間の任意の数字)
|
|
109
109
|
map_zoom_help: 地図の中心が定義されている場合にのみ適用されます
|
|
110
110
|
menu_amendments: 修正を表示
|
|
111
|
-
menu_categories: カテゴリー検索メニューを表示
|
|
112
111
|
menu_hashtags: ハッシュタグ検索メニューの表示
|
|
113
112
|
menu_meetings: ミーティングを表示
|
|
114
113
|
menu_merge_components: 同じ種類のすべてのコンポーネントをメニューに統合します
|
|
114
|
+
menu_taxonomies: タクソノミー検索メニューを表示
|
|
115
|
+
taxonomy_filters: コンポーネントのフィルタを選択
|
|
116
|
+
taxonomy_filters_add: フィルターを追加
|
|
115
117
|
truncate: ポップアップの説明のための最大文字数
|
|
116
118
|
step:
|
|
117
119
|
announcement: アナウンス
|
|
@@ -604,6 +606,7 @@ ja:
|
|
|
604
606
|
show_not_answered: 未回答の提案を表示
|
|
605
607
|
show_rejected: 却下された提案を表示
|
|
606
608
|
show_withdrawn: 撤回された提案を表示
|
|
609
|
+
taxonomies: タクソノミー
|
|
607
610
|
text_settings: テキストの設定
|
|
608
611
|
title: タイトル
|
|
609
612
|
truncate: ポップアップの説明のための最大文字数
|
|
@@ -678,6 +681,9 @@ ja:
|
|
|
678
681
|
weight_2_short: 'Y:'
|
|
679
682
|
weight_3: 緑
|
|
680
683
|
weight_3_short: 'G:'
|
|
684
|
+
download_your_data:
|
|
685
|
+
show:
|
|
686
|
+
admin_actions: 管理者の操作
|
|
681
687
|
meetings:
|
|
682
688
|
meetings_map:
|
|
683
689
|
view_meeting: ミーティングを表示
|
|
@@ -708,10 +714,10 @@ ja:
|
|
|
708
714
|
autosaved_error: お使いのブラウザーではLocalStorageをサポートしていないため、フォームは自動保存されません。
|
|
709
715
|
autosaved_retrieved: このフォームのデータは前回のセッションから復元しました
|
|
710
716
|
autosaved_success: ローカルストレージにデータを保存しました
|
|
711
|
-
categories: カテゴリー
|
|
712
717
|
drag_and_drop_image: ドラッグ&ドロップで画像を追加できます
|
|
713
718
|
hashtags: ハッシュタグ
|
|
714
719
|
items: 項目
|
|
715
720
|
meetings: ミーティング
|
|
716
721
|
proposals: 提案
|
|
717
722
|
select_deselect_all: まとめて選択・選択解除する
|
|
723
|
+
taxonomies: タクソノミー
|
data/config/locales/nl.yml
CHANGED
|
@@ -235,7 +235,6 @@ nl:
|
|
|
235
235
|
autosaved_error: LocalStorage wordt niet ondersteund in uw browser, formulier kan niet automatisch worden opgeslagen.
|
|
236
236
|
autosaved_retrieved: Gegevens voor dit formulier zijn hersteld van een vorige sessie
|
|
237
237
|
autosaved_success: Data opgeslagen in lokale opslag
|
|
238
|
-
categories: Categorieën
|
|
239
238
|
drag_and_drop_image: Voeg afbeeldingen toe door ze te slepen, te plaatsen of te plakken.
|
|
240
239
|
hashtags: Hashtags
|
|
241
240
|
items: items
|
data/config/locales/pt-BR.yml
CHANGED
|
@@ -62,7 +62,6 @@ pt-BR:
|
|
|
62
62
|
map_zoom: Zoom (qualquer número entre 0 e 18)
|
|
63
63
|
map_zoom_help: Só se aplica se um centro de mapa estiver definido
|
|
64
64
|
menu_amendments: Mostrar emendas
|
|
65
|
-
menu_categories: Mostrar menu de pesquisa de categora
|
|
66
65
|
menu_meetings: Mostrar reuniões
|
|
67
66
|
menu_merge_components: Mesclar todos os componentes do mesmo tipo no menu
|
|
68
67
|
truncate: Máximo de caracteres para descrições em popup
|
|
@@ -344,7 +343,6 @@ pt-BR:
|
|
|
344
343
|
autosaved_error: O armazenamento local não é suportado no seu navegador, o formulário não pode ser salvo automaticamente.
|
|
345
344
|
autosaved_retrieved: Os dados para este formulário foram recuperados de uma sessão anterior
|
|
346
345
|
autosaved_success: Dados salvos no armazenamento local
|
|
347
|
-
categories: Categorias
|
|
348
346
|
drag_and_drop_image: Adicione imagens arrastando e soltando ou colando-as.
|
|
349
347
|
hashtags: Hashtags
|
|
350
348
|
items: itens
|
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,64 +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
|
|
32
|
+
decidim-0.30.0: 30791e6637dedd413cdc037206726c2f
|
|
31
33
|
/app/presenters/decidim/admin_log/component_presenter.rb:
|
|
32
34
|
decidim-0.29.1: 77e80d527727acdf117a0c4517a69a7c
|
|
35
|
+
decidim-0.30.0: 0bfbd6771f52884a224f8e947ab15839
|
|
33
36
|
/app/forms/decidim/account_form.rb:
|
|
34
37
|
decidim-0.29.1: 11a022ae6ae18ad89da168bec4207935
|
|
35
38
|
decidim-0.29.3: 5872f17965919c0754a453ac4eb614df
|
|
36
39
|
/app/commands/decidim/update_account.rb:
|
|
37
40
|
decidim-0.29.1: d24090fdd9358c38e6e15c4607a78e18
|
|
41
|
+
decidim-0.30.0: f6c1fbdfd2e2c38bd9b6a43b335df975
|
|
38
42
|
/app/views/decidim/account/show.html.erb:
|
|
39
43
|
decidim-0.29.1: f13218e2358a2d611996c2a197c0de25
|
|
40
44
|
/app/cells/decidim/content_blocks/global_menu_cell.rb:
|
|
41
45
|
decidim-0.28.0: d224370c364a9cf4b2e244063274e5ef
|
|
42
46
|
/app/views/decidim/devise/registrations/new.html.erb:
|
|
43
47
|
decidim-0.29.1: b30423406afd43bb9af2c98d59d43632
|
|
48
|
+
decidim-0.30.0: 56884184f7f1582828a77fbeff2bb546
|
|
44
49
|
/app/views/decidim/devise/sessions/new.html.erb:
|
|
45
50
|
decidim-0.29.1: a8fe60cd10c1636822c252d5488a979d
|
|
51
|
+
decidim-0.30.0: da0d18178c8dcead2774956e989527c5
|
|
46
52
|
/app/views/decidim/shared/_login_modal.html.erb:
|
|
47
53
|
decidim-0.29.1: 0d615603bb45f7b209032578dda9fc72
|
|
54
|
+
decidim-0.30.0: 98bd2832be207d7abcd48d2a0ba40bd0
|
|
48
55
|
decidim-proposals:
|
|
49
56
|
/lib/decidim/proposals/proposal_serializer.rb:
|
|
50
57
|
decidim-0.29.1: 58915ff3a7528463587d3762a93ff51b
|
|
51
58
|
decidim-0.29.2: f52f5770d8596134624ecb79457a21de
|
|
59
|
+
decidim-0.30.0: 7e42fe689432706c6abbd832b9e3d3c3
|
|
52
60
|
/lib/decidim/api/proposal_type.rb:
|
|
53
61
|
decidim-0.29.1: 25d61a67a4b969ac8c472237d3f64b66
|
|
54
62
|
decidim-0.29.2: cd24561962f6fb6038678795f60bdec3
|
|
63
|
+
decidim-0.30.0: 3b9dd9c3afc8ee0c9a7bb1e46c865a60
|
|
55
64
|
/app/forms/decidim/proposals/proposal_form.rb:
|
|
56
65
|
decidim-0.29.1: 0b19bfeb4f7bd15cd378a69c3935de6b
|
|
57
66
|
decidim-0.29.2: ad4ff4bde6ee2e802d394382ef7859a4
|
|
67
|
+
decidim-0.30.0: 8db839481fec2a53acecabbf22377aa6
|
|
58
68
|
/app/forms/decidim/proposals/admin/proposal_form.rb:
|
|
59
69
|
decidim-0.29.1: 422632395194b19beed4c7c65f127ff5
|
|
60
70
|
decidim-0.29.2: ad4ff4bde6ee2e802d394382ef7859a4
|
|
71
|
+
decidim-0.30.0: 34e42ec6c9911b60c28d2bb49f066a8c
|
|
61
72
|
/app/helpers/decidim/proposals/application_helper.rb:
|
|
62
73
|
decidim-0.29.1: 940488938f644b63a2ef6177f3757ca2
|
|
63
74
|
decidim-0.29.3: e6039a99268845c5038f913309fde432
|
|
75
|
+
decidim-0.30.0: e539b6feb12c515ec24ed6d3efd6e29e
|
|
64
76
|
/app/controllers/decidim/proposals/proposal_votes_controller.rb:
|
|
65
77
|
decidim-0.29.1: f983e72c1ee8d31222d537533c762cd2
|
|
66
78
|
/app/views/decidim/proposals/admin/proposals/_form.html.erb:
|
|
67
79
|
decidim-0.29.1: 667c2ef6ffbf3369f59bd1e8eb0ba421
|
|
68
80
|
decidim-0.29.3: 59a7ed11d05a633cd4bf23881254b7f1
|
|
81
|
+
decidim-0.30.0: bbf9f55b307e6ba22a70289712bc019b
|
|
82
|
+
decidim-0.30.1: 7619190e4de00729893f62bce180a8e5
|
|
69
83
|
/app/views/decidim/proposals/proposals/_vote_button.html.erb:
|
|
70
84
|
decidim-0.29.1: 06dd4c9bf7fc4953fc330b7ba081b2f6
|
|
85
|
+
decidim-0.30.0: 644e8d24ad9571939e150190443b054a
|
|
86
|
+
decidim-0.30.1: 3cd74a9396d20e19ed3821f08cbe2b06
|
|
71
87
|
/app/views/decidim/proposals/proposals/_votes_count.html.erb:
|
|
72
88
|
decidim-0.29.1: 6e663e5c82c27291b63f29f346df8737
|
|
89
|
+
decidim-0.30.0: 6af6cdeeff0fc0daad028b88ee1c21cb
|
|
73
90
|
/app/cells/decidim/proposals/proposal_l_cell.rb:
|
|
74
91
|
decidim-0.29.1: e38d1cd0ea6c7f14c8f8b56d3ceb0db5
|
|
75
92
|
decidim-0.29.2: 5043d8560a26fce2e296b3a0f6ba6cf6
|
|
93
|
+
decidim-0.30.0: 682349209dad2f878f4d996a6c2b0bab
|
|
76
94
|
/app/cells/decidim/proposals/proposal_metadata_cell.rb:
|
|
77
95
|
decidim-0.29.1: 6859b77805227c4cf71ae0a1351a4551
|
|
96
|
+
decidim-0.30.0: 04239cfbbd8defc21f85bbd533e2d1a6
|
|
78
97
|
/app/commands/decidim/proposals/create_proposal.rb:
|
|
79
98
|
decidim-0.29.1: 02a6f54a032457e68be580e6a539c47b
|
|
99
|
+
decidim-0.30.0: e754afeca5167e04e40b856999667706
|
|
80
100
|
/app/commands/decidim/proposals/create_collaborative_draft.rb:
|
|
81
101
|
decidim-0.29.1: ab3f937f15c6ed945e776fef34b18abf
|
|
102
|
+
decidim-0.30.0: 64fb896383da98334648ce607dde0a27
|
|
82
103
|
/app/commands/decidim/proposals/admin/create_proposal.rb:
|
|
83
104
|
decidim-0.29.1: 837d86d2eb1f2d7579a0cef82d68caf7
|
|
105
|
+
decidim-0.30.0: 6d3daa0339abd4cc07859292dda319bb
|
|
84
106
|
/app/commands/decidim/proposals/update_proposal.rb:
|
|
85
107
|
decidim-0.29.1: e81268a1f9b3770387944d44d7704291
|
|
108
|
+
decidim-0.30.0: 2dcc14554207bbe287897543728a4d4d
|
|
86
109
|
/app/commands/decidim/proposals/update_collaborative_draft.rb:
|
|
87
110
|
decidim-0.29.1: 7df5266382bd57db72832da391fe7e11
|
|
111
|
+
decidim-0.30.0: 21b0546e5ea23b251cab3f9403732af6
|
|
88
112
|
/app/commands/decidim/proposals/admin/update_proposal.rb:
|
|
89
113
|
decidim-0.29.1: 67b691b6d1ce61cb198592ac25f76f74
|
|
114
|
+
decidim-0.30.0: d41045482929b4a561186d31a71666c4
|
|
90
115
|
/app/presenters/decidim/proposals/proposal_presenter.rb:
|
|
91
116
|
decidim-0.29.1: bbc7cee02125c1f8cf909219e48af337
|
|
117
|
+
decidim-0.30.0: b12cfb5e55aff4756d757e71e580c547
|
|
@@ -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,
|
|
@@ -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|
|
|
@@ -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 ===
|
|
@@ -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
|
|
@@ -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
|
}
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: decidim-decidim_awesome
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.13.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ivan Vergés
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2025-09-
|
|
11
|
+
date: 2025-09-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: active_hashcash
|
|
@@ -30,40 +30,40 @@ dependencies:
|
|
|
30
30
|
requirements:
|
|
31
31
|
- - ">="
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
|
-
version: 0.
|
|
33
|
+
version: 0.30.0
|
|
34
34
|
- - "<"
|
|
35
35
|
- !ruby/object:Gem::Version
|
|
36
|
-
version: '0.
|
|
36
|
+
version: '0.31'
|
|
37
37
|
type: :runtime
|
|
38
38
|
prerelease: false
|
|
39
39
|
version_requirements: !ruby/object:Gem::Requirement
|
|
40
40
|
requirements:
|
|
41
41
|
- - ">="
|
|
42
42
|
- !ruby/object:Gem::Version
|
|
43
|
-
version: 0.
|
|
43
|
+
version: 0.30.0
|
|
44
44
|
- - "<"
|
|
45
45
|
- !ruby/object:Gem::Version
|
|
46
|
-
version: '0.
|
|
46
|
+
version: '0.31'
|
|
47
47
|
- !ruby/object:Gem::Dependency
|
|
48
48
|
name: decidim-core
|
|
49
49
|
requirement: !ruby/object:Gem::Requirement
|
|
50
50
|
requirements:
|
|
51
51
|
- - ">="
|
|
52
52
|
- !ruby/object:Gem::Version
|
|
53
|
-
version: 0.
|
|
53
|
+
version: 0.30.0
|
|
54
54
|
- - "<"
|
|
55
55
|
- !ruby/object:Gem::Version
|
|
56
|
-
version: '0.
|
|
56
|
+
version: '0.31'
|
|
57
57
|
type: :runtime
|
|
58
58
|
prerelease: false
|
|
59
59
|
version_requirements: !ruby/object:Gem::Requirement
|
|
60
60
|
requirements:
|
|
61
61
|
- - ">="
|
|
62
62
|
- !ruby/object:Gem::Version
|
|
63
|
-
version: 0.
|
|
63
|
+
version: 0.30.0
|
|
64
64
|
- - "<"
|
|
65
65
|
- !ruby/object:Gem::Version
|
|
66
|
-
version: '0.
|
|
66
|
+
version: '0.31'
|
|
67
67
|
- !ruby/object:Gem::Dependency
|
|
68
68
|
name: deface
|
|
69
69
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -224,7 +224,7 @@ files:
|
|
|
224
224
|
- app/overrides/decidim/proposals/admin/proposals/_form/replace_editor.html.erb.deface
|
|
225
225
|
- app/overrides/decidim/proposals/admin/proposals/show/add_private_body.html.erb.deface
|
|
226
226
|
- app/overrides/decidim/proposals/admin/proposals/show/replace_body.html.erb.deface
|
|
227
|
-
- app/overrides/decidim/proposals/proposals/
|
|
227
|
+
- app/overrides/decidim/proposals/proposals/_proposal_actions/limit_amendments_modal.html.erb.deface
|
|
228
228
|
- app/overrides/decidim/proposals/proposals/_vote_button/replace_vote_button.html.erb.deface
|
|
229
229
|
- app/overrides/decidim/proposals/proposals/_votes_count/replace_counter.html.erb.deface
|
|
230
230
|
- app/overrides/decidim/shared/_login_modal/add_hashcash.html.erb.deface
|
|
@@ -492,6 +492,7 @@ files:
|
|
|
492
492
|
- lib/decidim/decidim_awesome/test/layouts/decidim/_head.html.erb
|
|
493
493
|
- lib/decidim/decidim_awesome/test/layouts/decidim/admin/_header.html.erb
|
|
494
494
|
- lib/decidim/decidim_awesome/test/shared_examples/action_log_presenter_examples.rb
|
|
495
|
+
- lib/decidim/decidim_awesome/test/shared_examples/admin_accountability_contexts.rb
|
|
495
496
|
- lib/decidim/decidim_awesome/test/shared_examples/box_label_editor_examples.rb
|
|
496
497
|
- lib/decidim/decidim_awesome/test/shared_examples/config_examples.rb
|
|
497
498
|
- lib/decidim/decidim_awesome/test/shared_examples/controller_examples.rb
|
|
@@ -506,6 +507,7 @@ files:
|
|
|
506
507
|
- lib/decidim/decidim_awesome/test/shared_examples/summary_examples.rb
|
|
507
508
|
- lib/decidim/decidim_awesome/version.rb
|
|
508
509
|
- lib/decidim/decidim_awesome/voting_manifest.rb
|
|
510
|
+
- lib/tasks/decidim_awesome_migrate_menu_categories.rake
|
|
509
511
|
- lib/tasks/decidim_awesome_upgrade_tasks.rake
|
|
510
512
|
- lib/tasks/decidim_awesome_webpacker_tasks.rake
|
|
511
513
|
- package.json
|
|
@@ -522,14 +524,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
522
524
|
requirements:
|
|
523
525
|
- - ">="
|
|
524
526
|
- !ruby/object:Gem::Version
|
|
525
|
-
version: '3.
|
|
527
|
+
version: '3.3'
|
|
526
528
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
527
529
|
requirements:
|
|
528
530
|
- - ">="
|
|
529
531
|
- !ruby/object:Gem::Version
|
|
530
532
|
version: '0'
|
|
531
533
|
requirements: []
|
|
532
|
-
rubygems_version: 3.
|
|
534
|
+
rubygems_version: 3.5.11
|
|
533
535
|
signing_key:
|
|
534
536
|
specification_version: 4
|
|
535
537
|
summary: A decidim decidim_awesome module
|
|
@@ -1,5 +0,0 @@
|
|
|
1
|
-
<!-- replace "erb[loud]:contains('amend_button_for @proposal')" -->
|
|
2
|
-
|
|
3
|
-
<%= amend_button_for @proposal %>
|
|
4
|
-
|
|
5
|
-
<%= render "decidim/decidim_awesome/amendments/modal" if @proposal.emendations.not_hidden.where(decidim_amendments: { state: Decidim::Amendment.states["evaluating"] }).count.positive? && @proposal.amendable? %>
|