decidim-decidim_awesome 0.6.6 → 0.8.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +93 -36
- data/Rakefile +11 -12
- data/app/cells/decidim/decidim_awesome/content_blocks/map/error.erb +11 -0
- data/app/cells/decidim/decidim_awesome/content_blocks/map/show.erb +14 -0
- data/app/cells/decidim/decidim_awesome/content_blocks/map_cell.rb +65 -0
- data/app/cells/decidim/decidim_awesome/content_blocks/map_form/show.erb +65 -0
- data/app/cells/decidim/decidim_awesome/content_blocks/map_form_cell.rb +19 -0
- data/app/commands/concerns/decidim/decidim_awesome/admin/needs_constraint_helpers.rb +32 -0
- data/app/commands/decidim/decidim_awesome/admin/create_custom_redirect.rb +51 -0
- data/app/commands/decidim/decidim_awesome/admin/create_proposal_custom_field.rb +45 -0
- data/app/commands/decidim/decidim_awesome/admin/create_scoped_admin.rb +38 -0
- data/app/commands/decidim/decidim_awesome/admin/destroy_constraint.rb +4 -0
- data/app/commands/decidim/decidim_awesome/admin/destroy_custom_redirect.rb +47 -0
- data/app/commands/decidim/decidim_awesome/admin/destroy_proposal_custom_field.rb +40 -0
- data/app/commands/decidim/decidim_awesome/admin/destroy_scoped_admin.rb +40 -0
- data/app/commands/decidim/decidim_awesome/admin/destroy_scoped_style.rb +1 -1
- data/app/commands/decidim/decidim_awesome/admin/rename_scope_label.rb +58 -0
- data/app/commands/decidim/decidim_awesome/admin/update_config.rb +5 -1
- data/app/commands/decidim/decidim_awesome/admin/update_custom_redirect.rb +49 -0
- data/app/commands/decidim/decidim_awesome/create_editor_image.rb +12 -5
- data/app/controllers/concerns/decidim/decidim_awesome/not_found_redirect.rb +58 -0
- data/app/controllers/decidim/decidim_awesome/admin/checks_controller.rb +15 -22
- data/app/controllers/decidim/decidim_awesome/admin/config_controller.rb +41 -20
- data/app/controllers/decidim/decidim_awesome/admin/constraints_controller.rb +4 -0
- data/app/controllers/decidim/decidim_awesome/admin/custom_redirects_controller.rb +91 -0
- data/app/controllers/decidim/decidim_awesome/admin/menu_hacks_controller.rb +7 -10
- data/app/controllers/decidim/decidim_awesome/admin/proposal_custom_fields_controller.rb +38 -0
- data/app/controllers/decidim/decidim_awesome/admin/scoped_admins_controller.rb +38 -0
- data/app/controllers/decidim/decidim_awesome/admin/scoped_styles_controller.rb +38 -0
- data/app/controllers/decidim/decidim_awesome/blank_component_controller.rb +19 -0
- data/app/controllers/decidim/decidim_awesome/editor_images_controller.rb +2 -3
- data/app/controllers/decidim/decidim_awesome/iframe_component/iframe_controller.rb +1 -1
- data/app/controllers/decidim/decidim_awesome/map_component/map_controller.rb +2 -9
- data/app/forms/decidim/decidim_awesome/admin/config_form.rb +52 -0
- data/app/forms/decidim/decidim_awesome/admin/constraint_form.rb +3 -1
- data/app/forms/decidim/decidim_awesome/admin/custom_redirect_form.rb +45 -0
- data/app/forms/decidim/decidim_awesome/editor_image_form.rb +3 -2
- data/app/forms/decidim/decidim_awesome/proposals/proposal_wizard_create_step_form_override.rb +38 -0
- data/app/helpers/decidim/decidim_awesome/admin/config_constraints_helpers.rb +32 -15
- data/app/helpers/decidim/decidim_awesome/admin/system_checker_helpers.rb +36 -0
- data/app/helpers/decidim/decidim_awesome/amendments_helper_override.rb +48 -0
- data/app/helpers/decidim/decidim_awesome/map_helper.rb +76 -57
- data/app/helpers/decidim/decidim_awesome/proposals/application_helper_override.rb +78 -0
- data/app/jobs/decidim/decidim_awesome/migrate_legacy_images_job.rb +106 -0
- data/app/middleware/decidim/decidim_awesome/current_config.rb +182 -0
- data/app/models/decidim/decidim_awesome/awesome_config.rb +15 -0
- data/app/models/decidim/decidim_awesome/editor_image.rb +4 -9
- data/app/models/decidim/decidim_awesome/user_override.rb +25 -0
- data/app/packs/entrypoints/decidim_admin_decidim_awesome.js +5 -0
- data/app/packs/entrypoints/decidim_admin_decidim_awesome.scss +1 -0
- data/app/packs/entrypoints/decidim_admin_decidim_awesome_custom_fields.js +2 -0
- data/app/packs/entrypoints/decidim_decidim_awesome.js +9 -0
- data/app/packs/entrypoints/decidim_decidim_awesome.scss +1 -0
- data/app/packs/entrypoints/decidim_decidim_awesome_admin_form_exit_warn.js +1 -0
- data/app/packs/entrypoints/decidim_decidim_awesome_custom_fields.js +1 -0
- data/app/packs/entrypoints/decidim_decidim_awesome_iframe.scss +1 -0
- data/app/packs/entrypoints/decidim_decidim_awesome_map.js +5 -0
- data/app/packs/entrypoints/decidim_decidim_awesome_map.scss +1 -0
- data/app/{assets → packs}/images/decidim/decidim_awesome/platoniq-logo.png +0 -0
- data/app/packs/src/decidim/decidim_awesome/admin/auto_edit.js +82 -0
- data/app/packs/src/decidim/decidim_awesome/admin/check_redirections.js +48 -0
- data/app/packs/src/decidim/decidim_awesome/admin/codemirror.js +14 -0
- data/app/packs/src/decidim/decidim_awesome/admin/constraints.js +55 -0
- data/app/packs/src/decidim/decidim_awesome/admin/custom_fields_builder.js +77 -0
- data/app/{assets/javascripts/decidim/decidim_awesome/admin/form_exit_warn.js.es6 → packs/src/decidim/decidim_awesome/admin/form_exit_warn.js} +0 -2
- data/app/packs/src/decidim/decidim_awesome/admin/user_picker.js +24 -0
- data/app/packs/src/decidim/decidim_awesome/awesome_admin.js +23 -0
- data/app/packs/src/decidim/decidim_awesome/awesome_application.js +17 -0
- data/app/{assets/javascripts/decidim/decidim_awesome/awesome_map/api_fetcher.js.es6 → packs/src/decidim/decidim_awesome/awesome_map/api/api_fetcher.js} +1 -15
- data/app/packs/src/decidim/decidim_awesome/awesome_map/api/fetcher.js +131 -0
- data/app/packs/src/decidim/decidim_awesome/awesome_map/api/meetings_fetcher.js +59 -0
- data/app/packs/src/decidim/decidim_awesome/awesome_map/api/proposals_fetcher.js +52 -0
- data/app/packs/src/decidim/decidim_awesome/awesome_map/awesome_map.js +130 -0
- data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/controller.js +112 -0
- data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/meetings_controller.js +31 -0
- data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/proposals_controller.js +88 -0
- data/app/packs/src/decidim/decidim_awesome/awesome_map/controls_ui.js +221 -0
- data/app/packs/src/decidim/decidim_awesome/awesome_map/load_map.js +51 -0
- data/app/packs/src/decidim/decidim_awesome/editors/editor.js +190 -0
- data/app/packs/src/decidim/decidim_awesome/editors/tabs_focus.js +22 -0
- data/app/{assets/javascripts/decidim/decidim_awesome/forms/autosave.js.es6 → packs/src/decidim/decidim_awesome/forms/autosave.js} +20 -17
- data/app/packs/src/decidim/decidim_awesome/forms/custom_fields_renderer.js +207 -0
- data/app/packs/src/decidim/decidim_awesome/forms/rich_text_plugin.js +107 -0
- data/app/packs/src/decidim/decidim_awesome/proposals/custom_fields.js +22 -0
- data/app/packs/src/decidim/decidim_awesome/proposals/images.js +25 -0
- data/{vendor/assets/javascripts → app/packs/src/vendor}/image-resize.min.js +0 -0
- data/{vendor/assets/javascripts → app/packs/src/vendor}/image-upload.min.js +0 -0
- data/app/packs/src/vendor/jquery.truncate.js +105 -0
- data/app/packs/src/vendor/leaflet.featuregroup.subgroup.js +184 -0
- data/app/packs/stylesheets/decidim/decidim_awesome/admin/auto_edits.scss +16 -0
- data/app/packs/stylesheets/decidim/decidim_awesome/admin/check_redirections.scss +28 -0
- data/app/packs/stylesheets/decidim/decidim_awesome/admin/codemirror.scss +29 -0
- data/app/{assets → packs}/stylesheets/decidim/decidim_awesome/admin/constraints.scss +21 -9
- data/app/packs/stylesheets/decidim/decidim_awesome/admin/custom_fields.scss +93 -0
- data/app/packs/stylesheets/decidim/decidim_awesome/admin/user_picker.scss +41 -0
- data/app/packs/stylesheets/decidim/decidim_awesome/awesome_admin.scss +71 -0
- data/app/packs/stylesheets/decidim/decidim_awesome/awesome_application.scss +19 -0
- data/app/{assets → packs}/stylesheets/decidim/decidim_awesome/awesome_iframe/iframe.scss +3 -3
- data/app/packs/stylesheets/decidim/decidim_awesome/awesome_map/map.scss +176 -0
- data/app/{assets → packs}/stylesheets/decidim/decidim_awesome/editors/markdown_editor.scss +6 -4
- data/app/packs/stylesheets/decidim/decidim_awesome/editors/quill_editor.scss +58 -0
- data/app/{assets → packs}/stylesheets/decidim/decidim_awesome/forms/autosave.scss +2 -2
- data/app/packs/stylesheets/vendor/select2-foundation-theme.scss +348 -0
- data/app/permissions/decidim/decidim_awesome/admin/permissions.rb +2 -0
- data/app/presenters/decidim/decidim_awesome/menu_item_presenter_override.rb +25 -0
- data/app/presenters/decidim/decidim_awesome/menu_presenter_override.rb +23 -0
- data/app/uploaders/decidim/cw/decidim_awesome/image_uploader.rb +26 -0
- data/app/uploaders/decidim/decidim_awesome/image_uploader.rb +4 -21
- data/app/views/decidim/decidim_awesome/admin/checks/index.html.erb +28 -22
- data/app/views/decidim/decidim_awesome/admin/config/_autoedit_box_label.html.erb +7 -0
- data/app/views/decidim/decidim_awesome/admin/config/_constraints.html.erb +3 -3
- data/app/views/decidim/decidim_awesome/admin/config/_form_admins.html.erb +21 -0
- data/app/views/decidim/decidim_awesome/admin/config/_form_editors.html.erb +1 -3
- data/app/views/decidim/decidim_awesome/admin/config/_form_proposal_custom_fields.html.erb +25 -0
- data/app/views/decidim/decidim_awesome/admin/config/_form_proposals.html.erb +0 -2
- data/app/views/decidim/decidim_awesome/admin/config/_form_styles.html.erb +11 -12
- data/app/views/decidim/decidim_awesome/admin/config/_modal.html.erb +1 -1
- data/app/views/decidim/decidim_awesome/admin/config/show.html.erb +3 -4
- data/app/views/decidim/decidim_awesome/admin/constraints/new.html.erb +1 -1
- data/app/views/decidim/decidim_awesome/admin/custom_redirects/_form.html.erb +6 -0
- data/app/views/decidim/decidim_awesome/admin/custom_redirects/edit.html.erb +13 -0
- data/app/views/decidim/decidim_awesome/admin/custom_redirects/index.html.erb +37 -0
- data/app/views/decidim/decidim_awesome/admin/custom_redirects/new.html.erb +13 -0
- data/app/views/decidim/decidim_awesome/admin/menu_hacks/edit.html.erb +1 -1
- data/app/views/decidim/decidim_awesome/admin/menu_hacks/new.html.erb +1 -1
- data/app/views/decidim/decidim_awesome/admin/proposals/_editor.html.erb +6 -0
- data/app/views/decidim/decidim_awesome/custom_fields/_form_render.html.erb +6 -0
- data/app/views/decidim/decidim_awesome/iframe_component/iframe/show.html.erb +1 -1
- data/app/views/decidim/decidim_awesome/map_component/map/_api_ready.html.erb +3 -0
- data/app/views/decidim/decidim_awesome/map_component/map/_map_template.html.erb +68 -0
- data/app/views/decidim/decidim_awesome/map_component/map/{error.erb → error.html.erb} +2 -0
- data/app/views/decidim/decidim_awesome/map_component/map/show.html.erb +3 -96
- data/app/views/decidim/proposals/admin/proposals/_form.html.erb +101 -0
- data/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb +83 -0
- data/app/views/decidim/proposals/collaborative_drafts/show.html.erb +1 -0
- data/app/views/layouts/decidim/admin/decidim_awesome.html.erb +34 -16
- data/app/views/layouts/decidim/decidim_awesome/_awesome_config.html.erb +6 -1
- data/app/views/layouts/decidim/decidim_awesome/_custom_styles.html.erb +1 -1
- data/app/views/v0.25/decidim/proposals/collaborative_drafts/_show.html.erb +128 -0
- data/app/views/{v0.23 → v0.25}/layouts/decidim/_head.html.erb +12 -10
- data/app/views/v0.25/layouts/decidim/admin/_header.html.erb +11 -0
- data/app/views/v0.26/decidim/proposals/collaborative_drafts/_show.html.erb +128 -0
- data/app/views/{v0.22 → v0.26}/layouts/decidim/_head.html.erb +18 -10
- data/app/views/v0.26/layouts/decidim/admin/_header.html.erb +11 -0
- data/config/assets.rb +46 -0
- data/config/i18n-tasks.yml +6 -0
- data/config/locales/ca.yml +147 -13
- data/config/locales/cs.yml +137 -3
- data/config/locales/en.yml +170 -11
- data/config/locales/es.yml +136 -2
- data/config/locales/eu.yml +1 -161
- data/config/locales/fr.yml +276 -142
- data/config/locales/it.yml +346 -0
- data/config/locales/ja.yml +345 -0
- data/config/locales/nl.yml +167 -136
- data/config/locales/pt-BR.yml +346 -0
- data/config/locales/pt-PT.yml +7 -0
- data/config/locales/pt.yml +7 -0
- data/config/locales/sv.yml +109 -152
- data/db/migrate/20210628150825_change_awesome_config_var_type.rb +12 -0
- data/lib/decidim/decidim_awesome/admin_engine.rb +19 -12
- data/lib/decidim/decidim_awesome/awesome.rb +214 -0
- data/lib/decidim/decidim_awesome/awesome_helpers.rb +17 -17
- data/lib/decidim/decidim_awesome/checksums.yml +23 -16
- data/lib/decidim/decidim_awesome/config.rb +55 -9
- data/lib/decidim/decidim_awesome/content_parsers/editor_images_parser.rb +39 -0
- data/lib/decidim/decidim_awesome/context_analyzers/request_analyzer.rb +27 -21
- data/lib/decidim/decidim_awesome/custom_fields.rb +94 -0
- data/lib/decidim/decidim_awesome/engine.rb +42 -14
- data/lib/decidim/decidim_awesome/iframe_component/admin_engine.rb +23 -0
- data/lib/decidim/decidim_awesome/iframe_component/component.rb +6 -6
- data/lib/decidim/decidim_awesome/map_component/admin_engine.rb +23 -0
- data/lib/decidim/decidim_awesome/map_component/component.rb +13 -6
- data/lib/decidim/decidim_awesome/map_component/engine.rb +34 -0
- data/lib/decidim/decidim_awesome/menu_hacker.rb +2 -1
- data/lib/decidim/decidim_awesome/system_checker.rb +1 -1
- data/lib/decidim/decidim_awesome/test/factories.rb +2 -2
- data/lib/decidim/decidim_awesome/test/initializer.rb +25 -0
- data/lib/decidim/decidim_awesome/test/layouts/decidim/_head.html.erb +30 -2
- data/lib/decidim/decidim_awesome/test/layouts/decidim/admin/_header.html.erb +7 -2
- data/lib/decidim/decidim_awesome/test/shared_examples/box_label_editor.rb +116 -0
- data/lib/decidim/decidim_awesome/test/shared_examples/config_examples.rb +18 -0
- data/lib/decidim/decidim_awesome/test/shared_examples/controller_examples.rb +13 -0
- data/lib/decidim/decidim_awesome/test/shared_examples/current_config_examples.rb +143 -0
- data/lib/decidim/decidim_awesome/test/shared_examples/custom_redirects_contexts.rb +47 -0
- data/lib/decidim/decidim_awesome/test/shared_examples/editor_examples.rb +4 -0
- data/lib/decidim/decidim_awesome/test/shared_examples/menu_hack_contexts.rb +0 -17
- data/lib/decidim/decidim_awesome/test/shared_examples/scoped_admins_examples.rb +420 -0
- data/lib/decidim/decidim_awesome/test/shared_examples/summary_examples.rb +202 -0
- data/lib/decidim/decidim_awesome/version.rb +2 -2
- data/lib/decidim/decidim_awesome.rb +4 -119
- data/lib/tasks/decidim_awesome_active_storage_migrations_tasks.rake +37 -0
- data/lib/tasks/decidim_awesome_webpacker_tasks.rake +62 -0
- metadata +148 -83
- data/app/assets/config/decidim_admin_decidim_awesome_manifest.css +0 -3
- data/app/assets/config/decidim_admin_decidim_awesome_manifest.js +0 -2
- data/app/assets/config/decidim_decidim_awesome_manifest.css +0 -5
- data/app/assets/config/decidim_decidim_awesome_manifest.js +0 -3
- data/app/assets/images/decidim/decidim_awesome/loading.gif +0 -0
- data/app/assets/javascripts/decidim/decidim_awesome/admin/constraints.js.es6 +0 -54
- data/app/assets/javascripts/decidim/decidim_awesome/admin.js +0 -2
- data/app/assets/javascripts/decidim/decidim_awesome/application.js +0 -4
- data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/categories.js.es6 +0 -25
- data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/legacy_map.js.es6 +0 -225
- data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/legacy_proposals.js.es6 +0 -82
- data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/map.js.es6 +0 -215
- data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/meetings.js.es6 +0 -131
- data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/proposals.js.es6 +0 -94
- data/app/assets/javascripts/decidim/decidim_awesome/editors/markdown_view.js.es6 +0 -12
- data/app/assets/javascripts/decidim/decidim_awesome/editors/quill_editor.js.es6 +0 -160
- data/app/assets/javascripts/decidim/decidim_awesome/proposals/images.js.es6 +0 -25
- data/app/assets/stylesheets/decidim/decidim_awesome/admin.scss +0 -49
- data/app/assets/stylesheets/decidim/decidim_awesome/application.scss +0 -8
- data/app/assets/stylesheets/decidim/decidim_awesome/awesome_map/leaflet.scss.erb +0 -9
- data/app/assets/stylesheets/decidim/decidim_awesome/awesome_map/map.scss +0 -66
- data/app/assets/stylesheets/decidim/decidim_awesome/editors/markdown_view.scss +0 -27
- data/app/assets/stylesheets/decidim/decidim_awesome/editors/quill_editor.scss +0 -7
- data/app/awesome_overrides/presenters/decidim/menu_presenter_override.rb +0 -39
- data/app/awesome_overrides/presenters/decidim/proposals/proposal_presenter_override.rb +0 -64
- data/app/controllers/decidim/decidim_awesome/iframe_component/application_controller.rb +0 -15
- data/app/controllers/decidim/decidim_awesome/map_component/application_controller.rb +0 -15
- data/app/views/v0.22/layouts/decidim/admin/_header.html.erb +0 -11
- data/app/views/v0.23/layouts/decidim/admin/_header.html.erb +0 -12
- data/lib/decidim/decidim_awesome/content_renderers/markdown_renderer.rb +0 -18
- data/lib/decidim/decidim_awesome/content_renderers.rb +0 -9
- data/lib/decidim/decidim_awesome/test/themes/css.lvh.me.css +0 -3
- data/lib/decidim/decidim_awesome/test/themes/erb.lvh.me.scss.erb +0 -2
- data/lib/decidim/decidim_awesome/test/themes/scss.lvh.me.scss +0 -1
- data/lib/decidim/decidim_awesome/test/themes/test-theme/body.scss +0 -4
- data/vendor/assets/images/layers-2x.png +0 -0
- data/vendor/assets/images/layers.png +0 -0
- data/vendor/assets/images/marker-icon.png +0 -0
- data/vendor/assets/javascripts/codemirror-4.inline-attachment.js +0 -89
- data/vendor/assets/javascripts/form-storage.js +0 -824
- data/vendor/assets/javascripts/highlight.min.js +0 -44
- data/vendor/assets/javascripts/inline-attachment.js +0 -399
- data/vendor/assets/javascripts/inscrybmde.min.js +0 -7
- data/vendor/assets/javascripts/jquery.inline-attachment.js +0 -66
- data/vendor/assets/javascripts/jsrender.min.js +0 -4
- data/vendor/assets/javascripts/leaflet.featuregroup.subgroup.js +0 -6
- data/vendor/assets/stylesheets/default.min.css +0 -1
- data/vendor/assets/stylesheets/foundation.min.css +0 -1
- data/vendor/assets/stylesheets/github.min.css +0 -2
- data/vendor/assets/stylesheets/inscrybmde.min.css +0 -8
@@ -1,23 +1,30 @@
|
|
1
1
|
decidim-admin:
|
2
2
|
/app/views/layouts/decidim/admin/_header.html.erb:
|
3
|
-
decidim-0.
|
4
|
-
decidim-0.23: 45f0e15f1b02a1c1a73b1a2184fd55af
|
3
|
+
decidim-0.25: 1aff077428830b12306d6c42e6b37216
|
5
4
|
decidim-core:
|
6
5
|
/app/views/layouts/decidim/_head.html.erb:
|
7
|
-
decidim-0.
|
8
|
-
decidim-0.
|
9
|
-
/app/
|
10
|
-
decidim-0.
|
11
|
-
decidim-0.
|
12
|
-
decidim-0.23.1: 4787f73f0f33661e3897404f10019d26
|
6
|
+
decidim-0.25: eb490aa482477ff70f541d20cddec773
|
7
|
+
decidim-0.26: 0927fc81123addec70853c2e7986c538
|
8
|
+
/app/packs/src/decidim/editor.js:
|
9
|
+
decidim-0.25: 742698903a30034094c01aecaca6de84
|
10
|
+
decidim-0.26: 651830d87aeeeff39316a787fc70d461
|
13
11
|
/app/presenters/decidim/menu_presenter.rb:
|
14
|
-
decidim-0.
|
15
|
-
decidim-0.23: 042743c44a2aff284b493c7bebbccbb3
|
12
|
+
decidim-0.25: f3b05daf279f909f8b3b628658dd5810
|
16
13
|
/app/presenters/decidim/menu_item_presenter.rb:
|
17
|
-
decidim-0.
|
18
|
-
|
14
|
+
decidim-0.25: 860ffb160ec5f8552cc2855a6a47851b
|
15
|
+
/app/helpers/decidim/amendments_helper.rb:
|
16
|
+
decidim-0.25: 63532a04fcf07cf92b789833a9421416
|
17
|
+
decidim-0.26: 636943ccb2e994fe0124dc87e72e49e9
|
19
18
|
decidim-proposals:
|
20
|
-
/app/
|
21
|
-
decidim-0.
|
22
|
-
|
23
|
-
decidim-0.
|
19
|
+
/app/forms/decidim/proposals/proposal_wizard_create_step_form.rb:
|
20
|
+
decidim-0.24: db69edd0ba8ffa3965a5c44a6bfaba8d
|
21
|
+
/app/helpers/decidim/proposals/application_helper.rb:
|
22
|
+
decidim-0.24: c5f99f5fa7de9a6e45776983330e9d73
|
23
|
+
decidim-0.26: 216c974bc425393c18b01bfc4eed4f0b
|
24
|
+
/app/views/decidim/proposals/collaborative_drafts/show.html.erb:
|
25
|
+
decidim-0.24: 2a7e0a4c65361f238fd1b917f39c8642
|
26
|
+
/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb:
|
27
|
+
decidim-0.24: 6f717555a20e2ab3f555003c337d3003
|
28
|
+
decidim-0.26: 97fa28043a26fc2940d30d38d9a7369b
|
29
|
+
/app/views/decidim/proposals/admin/proposals/_form.html.erb:
|
30
|
+
decidim-0.25: 90a04984d4269398b7cd21aa33763a1f
|
@@ -9,13 +9,14 @@ module Decidim
|
|
9
9
|
@vars = AwesomeConfig.for_organization(organization).includes(:constraints)
|
10
10
|
@context = {
|
11
11
|
participatory_space_manifest: nil,
|
12
|
-
|
12
|
+
participatory_space_slug: nil,
|
13
13
|
component_id: nil,
|
14
14
|
component_manifest: nil
|
15
15
|
}
|
16
|
+
@sub_configs = {}
|
16
17
|
end
|
17
18
|
|
18
|
-
attr_reader :context
|
19
|
+
attr_reader :context, :organization, :vars
|
19
20
|
attr_writer :defaults
|
20
21
|
|
21
22
|
def defaults
|
@@ -84,12 +85,59 @@ module Decidim
|
|
84
85
|
# if no constraints defined, applies to everything
|
85
86
|
return true if constraints.blank?
|
86
87
|
|
88
|
+
# if containts the "none" constraints, deactivate everything else
|
89
|
+
return false if constraints.detect { |c| c.settings["participatory_space_manifest"] == "none" }
|
90
|
+
|
87
91
|
# check if current context matches some constraint
|
88
92
|
constraints.detect do |constraint|
|
89
|
-
|
90
|
-
|
91
|
-
|
93
|
+
settings = constraint.settings.symbolize_keys
|
94
|
+
match_method = settings.delete(:match)
|
95
|
+
if match_method == "exclusive"
|
96
|
+
# all keys must match
|
97
|
+
settings == context
|
98
|
+
else
|
99
|
+
# constraints keys can match the context partially (ie: if slug is not specified, any space matches in the same manifest)
|
100
|
+
# if some setting is different, rejects
|
101
|
+
invalid = constraint.settings.detect { |key, val| context[key.to_sym].to_s != val.to_s }
|
102
|
+
invalid.blank?
|
103
|
+
end
|
104
|
+
end
|
105
|
+
end
|
106
|
+
|
107
|
+
# adds some custom constraints for the instance that can be generated dynamically
|
108
|
+
def inject_sub_config_constraints(singular_key, subkey, constraints)
|
109
|
+
sub_configs_for(singular_key)[subkey.to_sym]&.add_constraints constraints
|
110
|
+
end
|
111
|
+
|
112
|
+
# Merges all subconfigs values for custom_styles or any other scoped confs
|
113
|
+
# by default filtered according to the current scope, a block can be passed for custom filtering
|
114
|
+
# ie, collect everything:
|
115
|
+
# collect_sub_configs_values("scoped_style") { true }
|
116
|
+
def collect_sub_configs_values(singular_key)
|
117
|
+
plural_key = singular_key.pluralize.to_sym
|
118
|
+
return [] unless config[plural_key].respond_to?(:filter)
|
119
|
+
|
120
|
+
fields = config[plural_key]&.filter do |key, _value|
|
121
|
+
subconfig = sub_configs_for(singular_key)[key]
|
122
|
+
# allow custom filtering if block given
|
123
|
+
if block_given?
|
124
|
+
yield subconfig
|
125
|
+
else
|
126
|
+
valid_in_context?(subconfig&.all_constraints)
|
127
|
+
end
|
92
128
|
end
|
129
|
+
fields.values
|
130
|
+
end
|
131
|
+
|
132
|
+
def sub_configs_for(singular_key)
|
133
|
+
return @sub_configs[singular_key] if @sub_configs[singular_key]
|
134
|
+
|
135
|
+
plural_key = singular_key.pluralize.to_sym
|
136
|
+
return {} unless config[plural_key]
|
137
|
+
|
138
|
+
@sub_configs[singular_key] = config[plural_key].map do |key, _value|
|
139
|
+
[key, AwesomeConfig.find_by(var: "#{singular_key}_#{key}", organization: @organization)]
|
140
|
+
end.to_h
|
93
141
|
end
|
94
142
|
|
95
143
|
private
|
@@ -107,7 +155,7 @@ module Decidim
|
|
107
155
|
|
108
156
|
def calculate_config
|
109
157
|
# filter vars compliant with current context
|
110
|
-
valid = @vars.filter { |item| enabled_for_organization?(item.var) && valid_in_context?(item.
|
158
|
+
valid = @vars.filter { |item| enabled_for_organization?(item.var) && valid_in_context?(item.all_constraints) }
|
111
159
|
.map { |v| [v.var.to_sym, v.value] }.to_h
|
112
160
|
|
113
161
|
map_defaults do |key|
|
@@ -119,9 +167,7 @@ module Decidim
|
|
119
167
|
def enabled_for_organization?(key)
|
120
168
|
case key.to_sym
|
121
169
|
when :allow_images_in_proposals
|
122
|
-
if @organization.
|
123
|
-
return false if @organization.rich_text_editor_in_public_views
|
124
|
-
end
|
170
|
+
return false if @organization.rich_text_editor_in_public_views
|
125
171
|
end
|
126
172
|
true
|
127
173
|
end
|
@@ -0,0 +1,39 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module DecidimAwesome
|
5
|
+
module ContentParsers
|
6
|
+
# A parser that searches for editor images from CarrierWave in html
|
7
|
+
# contents and replaces them with migrated images to ActiveStorage
|
8
|
+
#
|
9
|
+
# @see BaseParser Examples of how to use a content parser
|
10
|
+
class EditorImagesParser < Decidim::ContentParsers::BaseParser
|
11
|
+
# @return [String] the content with the CarrierWave images replaced.
|
12
|
+
def rewrite
|
13
|
+
return content if editor_images.blank?
|
14
|
+
|
15
|
+
replace_editor_images
|
16
|
+
parsed_content.to_html
|
17
|
+
end
|
18
|
+
|
19
|
+
def editor_images
|
20
|
+
@editor_images ||= parsed_content.search(:img).index_with do |image|
|
21
|
+
context[:routes_mappings].find { |mapping| image.attr(:src).end_with?(mapping[:origin_path]) }
|
22
|
+
end.compact
|
23
|
+
end
|
24
|
+
|
25
|
+
private
|
26
|
+
|
27
|
+
def parsed_content
|
28
|
+
@parsed_content ||= Nokogiri::HTML(content)
|
29
|
+
end
|
30
|
+
|
31
|
+
def replace_editor_images
|
32
|
+
editor_images.each do |image, mapping|
|
33
|
+
image.set_attribute(:src, mapping[:instance].attached_uploader(:file).path)
|
34
|
+
end
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end
|
38
|
+
end
|
39
|
+
end
|
@@ -5,17 +5,32 @@ module Decidim
|
|
5
5
|
module ContextAnalyzers
|
6
6
|
# Translates some Decidim URL path to detected participatory spaces and components
|
7
7
|
class RequestAnalyzer
|
8
|
+
class << self
|
9
|
+
def context_for(request)
|
10
|
+
analyzer = new request
|
11
|
+
analyzer.extract_context!
|
12
|
+
analyzer.context
|
13
|
+
end
|
14
|
+
|
15
|
+
# In the frontend there's no a 100% correspondence between url and manifest name
|
16
|
+
def participatory_spaces_routes
|
17
|
+
spaces = Decidim.participatory_space_manifests \
|
18
|
+
.filter { |space| !DecidimAwesome.config.participatory_spaces_routes_context.has_key?(space.name) } \
|
19
|
+
.map { |space| [space.name.to_s, space.name.to_s] }.to_h
|
20
|
+
DecidimAwesome.config.participatory_spaces_routes_context.each do |manifest, routes|
|
21
|
+
routes.each do |route|
|
22
|
+
spaces[route.to_s] = manifest.to_s
|
23
|
+
end
|
24
|
+
end
|
25
|
+
spaces
|
26
|
+
end
|
27
|
+
end
|
28
|
+
|
8
29
|
def initialize(request)
|
9
30
|
@request = request
|
10
31
|
@context = {}
|
11
32
|
end
|
12
33
|
|
13
|
-
def self.context_for(request)
|
14
|
-
analyzer = new request
|
15
|
-
analyzer.extract_context!
|
16
|
-
analyzer.context
|
17
|
-
end
|
18
|
-
|
19
34
|
attr_reader :request, :context
|
20
35
|
|
21
36
|
def extract_context!
|
@@ -25,20 +40,8 @@ module Decidim
|
|
25
40
|
|
26
41
|
private
|
27
42
|
|
28
|
-
# In the frontend there's no a 100% correspondence between url and manifest name
|
29
|
-
def participatory_spaces
|
30
|
-
spaces = Decidim.participatory_space_manifests.map do |space|
|
31
|
-
[space.name.to_s, space.name.to_s]
|
32
|
-
end.to_h
|
33
|
-
spaces.merge(
|
34
|
-
"processes" => "participatory_processes",
|
35
|
-
"participatory_process_groups" => "participatory_processes",
|
36
|
-
"assemblies_types" => "assemblies"
|
37
|
-
)
|
38
|
-
end
|
39
|
-
|
40
43
|
def process_admin_segments(segments)
|
41
|
-
spaces =
|
44
|
+
spaces = RequestAnalyzer.participatory_spaces_routes
|
42
45
|
return unless spaces[segments[0]]
|
43
46
|
|
44
47
|
@context[:participatory_space_manifest] = spaces[segments[0]]
|
@@ -53,7 +56,7 @@ module Decidim
|
|
53
56
|
end
|
54
57
|
|
55
58
|
def process_front_segments(segments)
|
56
|
-
spaces =
|
59
|
+
spaces = RequestAnalyzer.participatory_spaces_routes
|
57
60
|
return unless spaces[segments[0]]
|
58
61
|
|
59
62
|
@context[:participatory_space_manifest] = spaces[segments[0]]
|
@@ -70,8 +73,11 @@ module Decidim
|
|
70
73
|
def system_manifest?(path)
|
71
74
|
patterns = [
|
72
75
|
%r{^/admin/newsletters},
|
76
|
+
%r{^/admin/moderations},
|
77
|
+
%r{^/admin/users},
|
73
78
|
%r{^/admin/organization},
|
74
|
-
%r{^/admin/static_pages}
|
79
|
+
%r{^/admin/static_pages},
|
80
|
+
%r{^/admin/logs}
|
75
81
|
]
|
76
82
|
path.match(Regexp.union(patterns))
|
77
83
|
end
|
@@ -0,0 +1,94 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module DecidimAwesome
|
5
|
+
class CustomFields
|
6
|
+
def initialize(fields)
|
7
|
+
@fields = if fields.respond_to? :map
|
8
|
+
fields.map { |f| JSON.parse(f) }.flatten
|
9
|
+
else
|
10
|
+
JSON.parse(fields)
|
11
|
+
end
|
12
|
+
end
|
13
|
+
|
14
|
+
attr_reader :fields, :xml, :errors, :data
|
15
|
+
|
16
|
+
def apply_xml(xml)
|
17
|
+
parse_xml(xml)
|
18
|
+
map_fields!
|
19
|
+
rescue StandardError => e
|
20
|
+
@errors = e.message
|
21
|
+
end
|
22
|
+
|
23
|
+
def to_json(*_args)
|
24
|
+
@fields
|
25
|
+
end
|
26
|
+
|
27
|
+
def translate!
|
28
|
+
translate_values!
|
29
|
+
end
|
30
|
+
|
31
|
+
private
|
32
|
+
|
33
|
+
def parse_xml(xml)
|
34
|
+
@xml = xml
|
35
|
+
@data = Nokogiri.XML(xml).xpath("//dl/dd")
|
36
|
+
return if @data.present?
|
37
|
+
|
38
|
+
apply_to_first_textarea
|
39
|
+
end
|
40
|
+
|
41
|
+
def map_fields!
|
42
|
+
return unless data
|
43
|
+
|
44
|
+
@fields.map! do |field|
|
45
|
+
if field["name"] # ignore headers/paragraphs
|
46
|
+
value = data.search("##{field["name"]} div")
|
47
|
+
field["userData"] = value.map { |v| v.attribute("alt")&.value || v.inner_html(encoding: "UTF-8") } if value.present?
|
48
|
+
end
|
49
|
+
|
50
|
+
field
|
51
|
+
end
|
52
|
+
end
|
53
|
+
|
54
|
+
# Finds the first textarea and applies non-xml compatible content
|
55
|
+
# when textarea has not wysiwyg assigned, strips html
|
56
|
+
def apply_to_first_textarea
|
57
|
+
# quill editor might leave html traces without any user content
|
58
|
+
# so we won't process it if there is no text (html free) result
|
59
|
+
text = Nokogiri.HTML(xml).html? ? Nokogiri.HTML(xml).text.strip : text.strip
|
60
|
+
return if text.blank?
|
61
|
+
|
62
|
+
textarea = @fields.find { |field| field["type"] == "textarea" }
|
63
|
+
@errors = I18n.t(".invalid_xml", scope: "decidim.decidim_awesome.custom_fields.errors")
|
64
|
+
return unless textarea
|
65
|
+
|
66
|
+
textarea["userData"] = [textarea["subtype"] == "textarea" ? text : xml]
|
67
|
+
@errors = I18n.t(".invalid_fields", scope: "decidim.decidim_awesome.custom_fields.errors", field: textarea["label"] || textarea["name"])
|
68
|
+
end
|
69
|
+
|
70
|
+
def translate_values!
|
71
|
+
deep_transform_values!(@fields) do |value|
|
72
|
+
next value unless value.is_a? String
|
73
|
+
next value unless (match = value.match(/^(.*\..*)$/))
|
74
|
+
|
75
|
+
I18n.t(match[1], raise: true)
|
76
|
+
rescue I18n::MissingTranslationData
|
77
|
+
value
|
78
|
+
end
|
79
|
+
@fields
|
80
|
+
end
|
81
|
+
|
82
|
+
def deep_transform_values!(object, &block)
|
83
|
+
case object
|
84
|
+
when Hash
|
85
|
+
object.transform_values! { |value| deep_transform_values!(value, &block) }
|
86
|
+
when Array
|
87
|
+
object.map! { |e| deep_transform_values!(e, &block) }
|
88
|
+
else
|
89
|
+
yield(object)
|
90
|
+
end
|
91
|
+
end
|
92
|
+
end
|
93
|
+
end
|
94
|
+
end
|
@@ -8,30 +8,58 @@ module Decidim
|
|
8
8
|
module DecidimAwesome
|
9
9
|
# This is the engine that runs on the public interface of decidim_awesome.
|
10
10
|
class Engine < ::Rails::Engine
|
11
|
+
include AwesomeHelpers
|
12
|
+
|
11
13
|
isolate_namespace Decidim::DecidimAwesome
|
12
14
|
|
13
15
|
routes do
|
14
16
|
post :editor_images, to: "editor_images#create"
|
15
17
|
end
|
16
18
|
|
17
|
-
initializer "decidim_awesome.view_helpers" do
|
18
|
-
ActionView::Base.send :include, AwesomeHelpers
|
19
|
-
end
|
20
|
-
|
21
|
-
initializer "decidim_decidim_awesome.assets" do |app|
|
22
|
-
app.config.assets.precompile += %w(decidim_decidim_awesome_manifest.js decidim_decidim_awesome_manifest.css)
|
23
|
-
# add to precompile any present theme asset
|
24
|
-
Dir.glob(Rails.root.join("app", "assets", "themes", "*.*")).each do |path|
|
25
|
-
app.config.assets.precompile << path
|
26
|
-
end
|
27
|
-
end
|
28
|
-
|
29
19
|
# Prepare a zone to create overrides
|
30
20
|
# https://edgeguides.rubyonrails.org/engines.html#overriding-models-and-controllers
|
21
|
+
# overrides
|
31
22
|
config.to_prepare do
|
32
|
-
|
33
|
-
|
23
|
+
# activate Decidim LayoutHelper for the overriden views
|
24
|
+
ActiveSupport.on_load :action_controller do
|
25
|
+
helper Decidim::LayoutHelper if respond_to?(:helper)
|
26
|
+
end
|
27
|
+
# Include additional helpers globally
|
28
|
+
ActionView::Base.include(Decidim::DecidimAwesome::AwesomeHelpers)
|
29
|
+
|
30
|
+
# override user's admin property
|
31
|
+
Decidim::User.include(Decidim::DecidimAwesome::UserOverride) if DecidimAwesome.enabled?(:scoped_admins)
|
32
|
+
|
33
|
+
# redirect unauthorized scoped admins to allowed places or custom redirects if configured
|
34
|
+
Decidim::ErrorsController.include(Decidim::DecidimAwesome::NotFoundRedirect) if DecidimAwesome.enabled?([:scoped_admins, :custom_redirects])
|
35
|
+
|
36
|
+
# Custom fields need to deal with several places
|
37
|
+
if DecidimAwesome.enabled?(:proposal_custom_fields)
|
38
|
+
Decidim::Proposals::ApplicationHelper.include(Decidim::DecidimAwesome::Proposals::ApplicationHelperOverride)
|
39
|
+
Decidim::Proposals::ProposalWizardCreateStepForm.include(Decidim::DecidimAwesome::Proposals::ProposalWizardCreateStepFormOverride)
|
40
|
+
Decidim::AmendmentsHelper.include(Decidim::DecidimAwesome::AmendmentsHelperOverride)
|
34
41
|
end
|
42
|
+
|
43
|
+
Decidim::MenuPresenter.include(Decidim::DecidimAwesome::MenuPresenterOverride)
|
44
|
+
Decidim::MenuItemPresenter.include(Decidim::DecidimAwesome::MenuItemPresenterOverride)
|
45
|
+
|
46
|
+
# Late registering of components to take into account initializer values
|
47
|
+
DecidimAwesome.registered_components.each do |manifest, block|
|
48
|
+
Decidim.register_component(manifest, &block) unless DecidimAwesome.disabled_components.include?(manifest)
|
49
|
+
end
|
50
|
+
end
|
51
|
+
|
52
|
+
initializer "decidim.middleware" do |app|
|
53
|
+
app.config.middleware.insert_after Decidim::Middleware::CurrentOrganization, Decidim::DecidimAwesome::CurrentConfig
|
54
|
+
end
|
55
|
+
|
56
|
+
initializer "decidim_decidim_awesome.webpacker.assets_path" do
|
57
|
+
Decidim.register_assets_path File.expand_path("app/packs", root)
|
58
|
+
end
|
59
|
+
|
60
|
+
initializer "decidim_decidim_awesome.add_cells_view_paths" do
|
61
|
+
Cell::ViewModel.view_paths << File.expand_path("#{Decidim::DecidimAwesome::Engine.root}/app/cells")
|
62
|
+
Cell::ViewModel.view_paths << File.expand_path("#{Decidim::DecidimAwesome::Engine.root}/app/views")
|
35
63
|
end
|
36
64
|
end
|
37
65
|
end
|
@@ -0,0 +1,23 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "rails"
|
4
|
+
require "decidim/core"
|
5
|
+
|
6
|
+
module Decidim
|
7
|
+
module DecidimAwesome
|
8
|
+
module IframeComponent
|
9
|
+
# This is the engine is used to create the component Map.
|
10
|
+
class AdminEngine < ::Rails::Engine
|
11
|
+
isolate_namespace Decidim::DecidimAwesome::IframeComponent
|
12
|
+
|
13
|
+
routes do
|
14
|
+
root to: "iframe#settings"
|
15
|
+
end
|
16
|
+
|
17
|
+
def load_seed
|
18
|
+
nil
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
@@ -1,10 +1,10 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
3
|
+
require "decidim/components/namer"
|
4
4
|
|
5
|
-
Decidim.register_component(:awesome_iframe) do |component|
|
5
|
+
Decidim::DecidimAwesome.register_component(:awesome_iframe) do |component|
|
6
6
|
component.engine = Decidim::DecidimAwesome::IframeComponent::Engine
|
7
|
-
|
7
|
+
component.admin_engine = Decidim::DecidimAwesome::IframeComponent::AdminEngine
|
8
8
|
component.icon = "decidim/meetings/icon.svg" # TODO: create a Icon
|
9
9
|
component.permissions_class_name = "Decidim::DecidimAwesome::Permissions"
|
10
10
|
|
@@ -15,7 +15,7 @@ Decidim.register_component(:awesome_iframe) do |component|
|
|
15
15
|
# Add your global settings
|
16
16
|
# Available types: :integer, :boolean
|
17
17
|
settings.attribute :announcement, type: :text, translated: true, editor: true
|
18
|
-
settings.attribute :iframe, type: :text
|
18
|
+
settings.attribute :iframe, type: :text, default: ""
|
19
19
|
settings.attribute :viewport_width, type: :boolean, default: false
|
20
20
|
settings.attribute :no_margins, type: :boolean, default: false
|
21
21
|
end
|
@@ -23,7 +23,7 @@ Decidim.register_component(:awesome_iframe) do |component|
|
|
23
23
|
component.settings(:step) do |settings|
|
24
24
|
# Add your settings per step
|
25
25
|
settings.attribute :announcement, type: :text, translated: true, editor: true
|
26
|
-
settings.attribute :iframe, type: :text
|
26
|
+
settings.attribute :iframe, type: :text, default: ""
|
27
27
|
end
|
28
28
|
|
29
29
|
# component.register_stat :some_stat do |context, start_at, end_at|
|
@@ -43,7 +43,7 @@ Decidim.register_component(:awesome_iframe) do |component|
|
|
43
43
|
published_at: Time.current,
|
44
44
|
participatory_space: participatory_space,
|
45
45
|
settings: {
|
46
|
-
announcement: { en: Faker::Lorem.paragraphs(2).join("\n") }
|
46
|
+
announcement: { en: Faker::Lorem.paragraphs(number: 2).join("\n") }
|
47
47
|
}
|
48
48
|
}
|
49
49
|
|
@@ -0,0 +1,23 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "rails"
|
4
|
+
require "decidim/core"
|
5
|
+
|
6
|
+
module Decidim
|
7
|
+
module DecidimAwesome
|
8
|
+
module MapComponent
|
9
|
+
# This is the engine is used to create the component Map.
|
10
|
+
class AdminEngine < ::Rails::Engine
|
11
|
+
isolate_namespace Decidim::DecidimAwesome::MapComponent
|
12
|
+
|
13
|
+
routes do
|
14
|
+
root to: "map#settings"
|
15
|
+
end
|
16
|
+
|
17
|
+
def load_seed
|
18
|
+
nil
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
@@ -1,10 +1,10 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
3
|
+
require "decidim/components/namer"
|
4
4
|
|
5
|
-
Decidim.register_component(:awesome_map) do |component|
|
5
|
+
Decidim::DecidimAwesome.register_component(:awesome_map) do |component|
|
6
6
|
component.engine = Decidim::DecidimAwesome::MapComponent::Engine
|
7
|
-
|
7
|
+
component.admin_engine = Decidim::DecidimAwesome::MapComponent::AdminEngine
|
8
8
|
component.icon = "decidim/meetings/icon.svg" # TODO: create a Icon
|
9
9
|
component.permissions_class_name = "Decidim::DecidimAwesome::Permissions"
|
10
10
|
|
@@ -16,7 +16,15 @@ Decidim.register_component(:awesome_map) do |component|
|
|
16
16
|
# Available types: :integer, :boolean
|
17
17
|
settings.attribute :announcement, type: :text, translated: true, editor: true
|
18
18
|
settings.attribute :map_height, type: :integer, default: 700
|
19
|
+
settings.attribute :map_center, type: :string, default: ""
|
20
|
+
settings.attribute :map_zoom, type: :integer, default: 8
|
21
|
+
settings.attribute :truncate, type: :integer, default: 255
|
19
22
|
settings.attribute :collapse, type: :boolean, default: false
|
23
|
+
settings.attribute :menu_amendments, type: :boolean, default: true
|
24
|
+
settings.attribute :menu_meetings, type: :boolean, default: true
|
25
|
+
settings.attribute :menu_categories, type: :boolean, default: true
|
26
|
+
settings.attribute :menu_hashtags, type: :boolean, default: true
|
27
|
+
settings.attribute :menu_merge_components, type: :boolean, default: false
|
20
28
|
end
|
21
29
|
|
22
30
|
component.settings(:step) do |settings|
|
@@ -25,8 +33,7 @@ Decidim.register_component(:awesome_map) do |component|
|
|
25
33
|
settings.attribute :show_not_answered, type: :boolean, default: true
|
26
34
|
settings.attribute :show_evaluating, type: :boolean, default: true
|
27
35
|
settings.attribute :show_accepted, type: :boolean, default: true
|
28
|
-
|
29
|
-
# settings.attribute :show_rejected, type: :boolean, default: false
|
36
|
+
settings.attribute :show_rejected, type: :boolean, default: false
|
30
37
|
settings.attribute :show_withdrawn, type: :boolean, default: false
|
31
38
|
end
|
32
39
|
|
@@ -47,7 +54,7 @@ Decidim.register_component(:awesome_map) do |component|
|
|
47
54
|
published_at: Time.current,
|
48
55
|
participatory_space: participatory_space,
|
49
56
|
settings: {
|
50
|
-
announcement: { en: Faker::Lorem.paragraphs(2).join("\n") }
|
57
|
+
announcement: { en: Faker::Lorem.paragraphs(number: 2).join("\n") }
|
51
58
|
}
|
52
59
|
}
|
53
60
|
|
@@ -14,6 +14,40 @@ module Decidim
|
|
14
14
|
root to: "map#show"
|
15
15
|
end
|
16
16
|
|
17
|
+
initializer "decidim_decidim_awesome.content_blocks" do |_app|
|
18
|
+
# do not register this if awesome_map is disabled
|
19
|
+
next if DecidimAwesome.disabled_components.include?(:awesome_map)
|
20
|
+
|
21
|
+
# === Home Map block ===
|
22
|
+
Decidim.content_blocks.register(:homepage, :awesome_map) do |content_block|
|
23
|
+
content_block.cell = "decidim/decidim_awesome/content_blocks/map"
|
24
|
+
content_block.settings_form_cell = "decidim/decidim_awesome/content_blocks/map_form"
|
25
|
+
content_block.public_name_key = "decidim.decidim_awesome.content_blocks.map.name"
|
26
|
+
|
27
|
+
content_block.settings do |settings|
|
28
|
+
settings.attribute :title, type: :text, translated: true
|
29
|
+
|
30
|
+
settings.attribute :map_height, type: :integer, default: 500
|
31
|
+
settings.attribute :map_center, type: :string, default: ""
|
32
|
+
settings.attribute :map_zoom, type: :integer, default: 8
|
33
|
+
settings.attribute :truncate, type: :integer, default: 255
|
34
|
+
settings.attribute :collapse, type: :boolean, default: false
|
35
|
+
settings.attribute :menu_amendments, type: :boolean, default: true
|
36
|
+
settings.attribute :menu_meetings, type: :boolean, default: true
|
37
|
+
settings.attribute :menu_hashtags, type: :boolean, default: true
|
38
|
+
settings.attribute :menu_categories, type: :boolean, default: true
|
39
|
+
settings.attribute :menu_merge_components, type: :boolean, default: true
|
40
|
+
|
41
|
+
settings.attribute :show_not_answered, type: :boolean, default: true
|
42
|
+
settings.attribute :show_accepted, type: :boolean, default: true
|
43
|
+
settings.attribute :show_withdrawn, type: :boolean, default: false
|
44
|
+
settings.attribute :show_evaluating, type: :boolean, default: true
|
45
|
+
settings.attribute :show_rejected, type: :boolean, default: false
|
46
|
+
end
|
47
|
+
end
|
48
|
+
# === TODO: processes groups map block ===
|
49
|
+
end
|
50
|
+
|
17
51
|
def load_seed
|
18
52
|
nil
|
19
53
|
end
|
@@ -4,6 +4,7 @@ module Decidim
|
|
4
4
|
module DecidimAwesome
|
5
5
|
class MenuHacker
|
6
6
|
include Decidim::TranslatableAttributes
|
7
|
+
|
7
8
|
def initialize(name, view)
|
8
9
|
@name = name
|
9
10
|
@organization = view.try(:current_organization)
|
@@ -12,7 +13,7 @@ module Decidim
|
|
12
13
|
end
|
13
14
|
|
14
15
|
# returns a combined array of the Decidim defined menu and the hacked stored as config vars
|
15
|
-
def items(include_invisible
|
16
|
+
def items(include_invisible: false)
|
16
17
|
return @items if @items
|
17
18
|
|
18
19
|
@items = default_items
|
@@ -14,7 +14,7 @@ module Decidim
|
|
14
14
|
@overrides = checksums.map do |package, files|
|
15
15
|
props = {
|
16
16
|
spec: ::Gem::Specification.find_by_name(package),
|
17
|
-
files: files.
|
17
|
+
files: files.transform_values(&:values)
|
18
18
|
}
|
19
19
|
[package, to_struct(props)]
|
20
20
|
end
|
@@ -15,8 +15,8 @@ FactoryBot.define do
|
|
15
15
|
awesome_config { create :awesome_config }
|
16
16
|
end
|
17
17
|
|
18
|
-
factory :
|
19
|
-
|
18
|
+
factory :awesome_editor_image, class: "Decidim::DecidimAwesome::EditorImage" do
|
19
|
+
file { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
|
20
20
|
path { Faker::Internet.url(host: "", scheme: "") }
|
21
21
|
author { create :user }
|
22
22
|
organization { create :organization }
|