decidim-decidim_awesome 0.6.7 → 0.8.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (257) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +181 -0
  3. data/README.md +88 -36
  4. data/Rakefile +11 -12
  5. data/app/cells/decidim/decidim_awesome/content_blocks/map/error.erb +11 -0
  6. data/app/cells/decidim/decidim_awesome/content_blocks/map/show.erb +14 -0
  7. data/app/cells/decidim/decidim_awesome/content_blocks/map_cell.rb +65 -0
  8. data/app/cells/decidim/decidim_awesome/content_blocks/map_form/show.erb +65 -0
  9. data/app/cells/decidim/decidim_awesome/content_blocks/map_form_cell.rb +19 -0
  10. data/app/commands/concerns/decidim/decidim_awesome/admin/needs_constraint_helpers.rb +32 -0
  11. data/app/commands/decidim/decidim_awesome/admin/create_custom_redirect.rb +51 -0
  12. data/app/commands/decidim/decidim_awesome/admin/create_proposal_custom_field.rb +45 -0
  13. data/app/commands/decidim/decidim_awesome/admin/create_scoped_admin.rb +38 -0
  14. data/app/commands/decidim/decidim_awesome/admin/destroy_constraint.rb +4 -0
  15. data/app/commands/decidim/decidim_awesome/admin/destroy_custom_redirect.rb +47 -0
  16. data/app/commands/decidim/decidim_awesome/admin/destroy_proposal_custom_field.rb +40 -0
  17. data/app/commands/decidim/decidim_awesome/admin/destroy_scoped_admin.rb +40 -0
  18. data/app/commands/decidim/decidim_awesome/admin/destroy_scoped_style.rb +1 -1
  19. data/app/commands/decidim/decidim_awesome/admin/rename_scope_label.rb +58 -0
  20. data/app/commands/decidim/decidim_awesome/admin/update_config.rb +1 -0
  21. data/app/commands/decidim/decidim_awesome/admin/update_custom_redirect.rb +49 -0
  22. data/app/commands/decidim/decidim_awesome/create_editor_image.rb +12 -5
  23. data/app/controllers/concerns/decidim/decidim_awesome/not_found_redirect.rb +58 -0
  24. data/app/controllers/decidim/decidim_awesome/admin/checks_controller.rb +15 -22
  25. data/app/controllers/decidim/decidim_awesome/admin/config_controller.rb +39 -18
  26. data/app/controllers/decidim/decidim_awesome/admin/constraints_controller.rb +4 -0
  27. data/app/controllers/decidim/decidim_awesome/admin/custom_redirects_controller.rb +91 -0
  28. data/app/controllers/decidim/decidim_awesome/admin/menu_hacks_controller.rb +7 -10
  29. data/app/controllers/decidim/decidim_awesome/admin/proposal_custom_fields_controller.rb +38 -0
  30. data/app/controllers/decidim/decidim_awesome/admin/scoped_admins_controller.rb +38 -0
  31. data/app/controllers/decidim/decidim_awesome/admin/scoped_styles_controller.rb +38 -0
  32. data/app/controllers/decidim/decidim_awesome/blank_component_controller.rb +19 -0
  33. data/app/controllers/decidim/decidim_awesome/editor_images_controller.rb +2 -3
  34. data/app/controllers/decidim/decidim_awesome/iframe_component/iframe_controller.rb +1 -1
  35. data/app/controllers/decidim/decidim_awesome/map_component/map_controller.rb +2 -9
  36. data/app/forms/decidim/decidim_awesome/admin/config_form.rb +41 -0
  37. data/app/forms/decidim/decidim_awesome/admin/constraint_form.rb +3 -1
  38. data/app/forms/decidim/decidim_awesome/admin/custom_redirect_form.rb +45 -0
  39. data/app/forms/decidim/decidim_awesome/editor_image_form.rb +3 -2
  40. data/app/forms/decidim/decidim_awesome/proposals/proposal_wizard_create_step_form_override.rb +38 -0
  41. data/app/helpers/decidim/decidim_awesome/admin/config_constraints_helpers.rb +32 -15
  42. data/app/helpers/decidim/decidim_awesome/admin/system_checker_helpers.rb +36 -0
  43. data/app/helpers/decidim/decidim_awesome/amendments_helper_override.rb +48 -0
  44. data/app/helpers/decidim/decidim_awesome/map_helper.rb +76 -63
  45. data/app/helpers/decidim/decidim_awesome/proposals/application_helper_override.rb +78 -0
  46. data/app/jobs/decidim/decidim_awesome/migrate_legacy_images_job.rb +106 -0
  47. data/app/middleware/decidim/decidim_awesome/current_config.rb +182 -0
  48. data/app/models/decidim/decidim_awesome/awesome_config.rb +15 -0
  49. data/app/models/decidim/decidim_awesome/editor_image.rb +4 -9
  50. data/app/models/decidim/decidim_awesome/user_override.rb +25 -0
  51. data/app/packs/entrypoints/decidim_admin_decidim_awesome.js +5 -0
  52. data/app/packs/entrypoints/decidim_admin_decidim_awesome.scss +1 -0
  53. data/app/packs/entrypoints/decidim_admin_decidim_awesome_custom_fields.js +2 -0
  54. data/app/packs/entrypoints/decidim_decidim_awesome.js +9 -0
  55. data/app/packs/entrypoints/decidim_decidim_awesome.scss +1 -0
  56. data/app/packs/entrypoints/decidim_decidim_awesome_admin_form_exit_warn.js +1 -0
  57. data/app/packs/entrypoints/decidim_decidim_awesome_custom_fields.js +1 -0
  58. data/app/packs/entrypoints/decidim_decidim_awesome_iframe.scss +1 -0
  59. data/app/packs/entrypoints/decidim_decidim_awesome_map.js +5 -0
  60. data/app/packs/entrypoints/decidim_decidim_awesome_map.scss +1 -0
  61. data/app/{assets → packs}/images/decidim/decidim_awesome/platoniq-logo.png +0 -0
  62. data/app/packs/src/decidim/decidim_awesome/admin/auto_edit.js +82 -0
  63. data/app/packs/src/decidim/decidim_awesome/admin/check_redirections.js +48 -0
  64. data/app/packs/src/decidim/decidim_awesome/admin/codemirror.js +14 -0
  65. data/app/packs/src/decidim/decidim_awesome/admin/constraints.js +55 -0
  66. data/app/packs/src/decidim/decidim_awesome/admin/custom_fields_builder.js +77 -0
  67. 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
  68. data/app/packs/src/decidim/decidim_awesome/admin/user_picker.js +24 -0
  69. data/app/packs/src/decidim/decidim_awesome/awesome_admin.js +23 -0
  70. data/app/packs/src/decidim/decidim_awesome/awesome_application.js +17 -0
  71. 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
  72. data/app/packs/src/decidim/decidim_awesome/awesome_map/api/fetcher.js +131 -0
  73. data/app/packs/src/decidim/decidim_awesome/awesome_map/api/meetings_fetcher.js +59 -0
  74. data/app/packs/src/decidim/decidim_awesome/awesome_map/api/proposals_fetcher.js +52 -0
  75. data/app/packs/src/decidim/decidim_awesome/awesome_map/awesome_map.js +130 -0
  76. data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/controller.js +112 -0
  77. data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/meetings_controller.js +31 -0
  78. data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/proposals_controller.js +88 -0
  79. data/app/packs/src/decidim/decidim_awesome/awesome_map/controls_ui.js +221 -0
  80. data/app/packs/src/decidim/decidim_awesome/awesome_map/load_map.js +51 -0
  81. data/app/packs/src/decidim/decidim_awesome/editors/editor.js +190 -0
  82. data/app/packs/src/decidim/decidim_awesome/editors/tabs_focus.js +22 -0
  83. data/app/{assets/javascripts/decidim/decidim_awesome/forms/autosave.js.es6 → packs/src/decidim/decidim_awesome/forms/autosave.js} +20 -17
  84. data/app/packs/src/decidim/decidim_awesome/forms/custom_fields_renderer.js +207 -0
  85. data/app/packs/src/decidim/decidim_awesome/forms/rich_text_plugin.js +107 -0
  86. data/app/packs/src/decidim/decidim_awesome/proposals/custom_fields.js +22 -0
  87. data/app/packs/src/decidim/decidim_awesome/proposals/images.js +25 -0
  88. data/{vendor/assets/javascripts → app/packs/src/vendor}/image-resize.min.js +0 -0
  89. data/{vendor/assets/javascripts → app/packs/src/vendor}/image-upload.min.js +0 -0
  90. data/{vendor/assets/javascripts → app/packs/src/vendor}/jquery.truncate.js +0 -0
  91. data/app/packs/src/vendor/leaflet.featuregroup.subgroup.js +184 -0
  92. data/app/packs/stylesheets/decidim/decidim_awesome/admin/auto_edits.scss +16 -0
  93. data/app/packs/stylesheets/decidim/decidim_awesome/admin/check_redirections.scss +28 -0
  94. data/app/packs/stylesheets/decidim/decidim_awesome/admin/codemirror.scss +29 -0
  95. data/app/{assets → packs}/stylesheets/decidim/decidim_awesome/admin/constraints.scss +21 -9
  96. data/app/packs/stylesheets/decidim/decidim_awesome/admin/custom_fields.scss +93 -0
  97. data/app/packs/stylesheets/decidim/decidim_awesome/admin/user_picker.scss +41 -0
  98. data/app/packs/stylesheets/decidim/decidim_awesome/awesome_admin.scss +71 -0
  99. data/app/packs/stylesheets/decidim/decidim_awesome/awesome_application.scss +19 -0
  100. data/app/{assets → packs}/stylesheets/decidim/decidim_awesome/awesome_iframe/iframe.scss +3 -3
  101. data/app/packs/stylesheets/decidim/decidim_awesome/awesome_map/map.scss +176 -0
  102. data/app/{assets → packs}/stylesheets/decidim/decidim_awesome/editors/markdown_editor.scss +6 -4
  103. data/app/packs/stylesheets/decidim/decidim_awesome/editors/quill_editor.scss +58 -0
  104. data/app/{assets → packs}/stylesheets/decidim/decidim_awesome/forms/autosave.scss +2 -2
  105. data/app/packs/stylesheets/vendor/select2-foundation-theme.scss +348 -0
  106. data/app/permissions/decidim/decidim_awesome/admin/permissions.rb +2 -0
  107. data/app/presenters/decidim/decidim_awesome/menu_item_presenter_override.rb +25 -0
  108. data/app/presenters/decidim/decidim_awesome/menu_presenter_override.rb +23 -0
  109. data/app/uploaders/decidim/cw/decidim_awesome/image_uploader.rb +26 -0
  110. data/app/uploaders/decidim/decidim_awesome/image_uploader.rb +4 -21
  111. data/app/views/decidim/decidim_awesome/admin/checks/index.html.erb +28 -22
  112. data/app/views/decidim/decidim_awesome/admin/config/_autoedit_box_label.html.erb +7 -0
  113. data/app/views/decidim/decidim_awesome/admin/config/_constraints.html.erb +3 -3
  114. data/app/views/decidim/decidim_awesome/admin/config/_form_admins.html.erb +21 -0
  115. data/app/views/decidim/decidim_awesome/admin/config/_form_editors.html.erb +1 -3
  116. data/app/views/decidim/decidim_awesome/admin/config/_form_proposal_custom_fields.html.erb +25 -0
  117. data/app/views/decidim/decidim_awesome/admin/config/_form_proposals.html.erb +0 -2
  118. data/app/views/decidim/decidim_awesome/admin/config/_form_styles.html.erb +11 -13
  119. data/app/views/decidim/decidim_awesome/admin/config/_modal.html.erb +1 -1
  120. data/app/views/decidim/decidim_awesome/admin/config/show.html.erb +3 -3
  121. data/app/views/decidim/decidim_awesome/admin/constraints/new.html.erb +1 -1
  122. data/app/views/decidim/decidim_awesome/admin/custom_redirects/_form.html.erb +6 -0
  123. data/app/views/decidim/decidim_awesome/admin/custom_redirects/edit.html.erb +13 -0
  124. data/app/views/decidim/decidim_awesome/admin/custom_redirects/index.html.erb +37 -0
  125. data/app/views/decidim/decidim_awesome/admin/custom_redirects/new.html.erb +13 -0
  126. data/app/views/decidim/decidim_awesome/admin/menu_hacks/edit.html.erb +1 -1
  127. data/app/views/decidim/decidim_awesome/admin/menu_hacks/new.html.erb +1 -1
  128. data/app/views/decidim/decidim_awesome/admin/proposals/_editor.html.erb +6 -0
  129. data/app/views/decidim/decidim_awesome/custom_fields/_form_render.html.erb +6 -0
  130. data/app/views/decidim/decidim_awesome/iframe_component/iframe/show.html.erb +1 -1
  131. data/app/views/decidim/decidim_awesome/map_component/map/_api_ready.html.erb +3 -0
  132. data/app/views/decidim/decidim_awesome/map_component/map/_map_template.html.erb +68 -0
  133. data/app/views/decidim/decidim_awesome/map_component/map/{error.erb → error.html.erb} +2 -0
  134. data/app/views/decidim/decidim_awesome/map_component/map/show.html.erb +3 -99
  135. data/app/views/decidim/proposals/admin/proposals/_form.html.erb +101 -0
  136. data/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb +83 -0
  137. data/app/views/decidim/proposals/collaborative_drafts/show.html.erb +1 -0
  138. data/app/views/layouts/decidim/admin/decidim_awesome.html.erb +34 -16
  139. data/app/views/layouts/decidim/decidim_awesome/_awesome_config.html.erb +2 -0
  140. data/app/views/layouts/decidim/decidim_awesome/_custom_styles.html.erb +1 -1
  141. data/app/views/v0.25/decidim/proposals/collaborative_drafts/_show.html.erb +128 -0
  142. data/app/views/{v0.23 → v0.25}/layouts/decidim/_head.html.erb +12 -10
  143. data/app/views/v0.25/layouts/decidim/admin/_header.html.erb +11 -0
  144. data/app/views/v0.26/decidim/proposals/collaborative_drafts/_show.html.erb +128 -0
  145. data/app/views/{v0.22 → v0.26}/layouts/decidim/_head.html.erb +18 -10
  146. data/app/views/v0.26/layouts/decidim/admin/_header.html.erb +11 -0
  147. data/config/assets.rb +46 -0
  148. data/config/i18n-tasks.yml +6 -0
  149. data/config/locales/ca.yml +135 -14
  150. data/config/locales/cs.yml +124 -3
  151. data/config/locales/en.yml +156 -11
  152. data/config/locales/es.yml +123 -2
  153. data/config/locales/eu.yml +1 -174
  154. data/config/locales/fr.yml +136 -15
  155. data/config/locales/it.yml +346 -0
  156. data/config/locales/ja.yml +345 -0
  157. data/config/locales/nl.yml +23 -5
  158. data/config/locales/pt-BR.yml +346 -0
  159. data/config/locales/pt-PT.yml +7 -0
  160. data/config/locales/pt.yml +7 -0
  161. data/config/locales/sv.yml +75 -131
  162. data/db/migrate/20210628150825_change_awesome_config_var_type.rb +12 -0
  163. data/lib/decidim/decidim_awesome/admin_engine.rb +19 -12
  164. data/lib/decidim/decidim_awesome/awesome.rb +214 -0
  165. data/lib/decidim/decidim_awesome/awesome_helpers.rb +17 -17
  166. data/lib/decidim/decidim_awesome/checksums.yml +23 -16
  167. data/lib/decidim/decidim_awesome/config.rb +55 -9
  168. data/lib/decidim/decidim_awesome/content_parsers/editor_images_parser.rb +39 -0
  169. data/lib/decidim/decidim_awesome/context_analyzers/request_analyzer.rb +27 -21
  170. data/lib/decidim/decidim_awesome/custom_fields.rb +94 -0
  171. data/lib/decidim/decidim_awesome/engine.rb +42 -14
  172. data/lib/decidim/decidim_awesome/iframe_component/admin_engine.rb +23 -0
  173. data/lib/decidim/decidim_awesome/iframe_component/component.rb +6 -6
  174. data/lib/decidim/decidim_awesome/map_component/admin_engine.rb +23 -0
  175. data/lib/decidim/decidim_awesome/map_component/component.rb +6 -5
  176. data/lib/decidim/decidim_awesome/map_component/engine.rb +34 -0
  177. data/lib/decidim/decidim_awesome/menu_hacker.rb +2 -1
  178. data/lib/decidim/decidim_awesome/system_checker.rb +1 -1
  179. data/lib/decidim/decidim_awesome/test/factories.rb +2 -2
  180. data/lib/decidim/decidim_awesome/test/initializer.rb +25 -0
  181. data/lib/decidim/decidim_awesome/test/layouts/decidim/_head.html.erb +30 -2
  182. data/lib/decidim/decidim_awesome/test/layouts/decidim/admin/_header.html.erb +7 -2
  183. data/lib/decidim/decidim_awesome/test/shared_examples/box_label_editor.rb +116 -0
  184. data/lib/decidim/decidim_awesome/test/shared_examples/config_examples.rb +18 -0
  185. data/lib/decidim/decidim_awesome/test/shared_examples/controller_examples.rb +13 -0
  186. data/lib/decidim/decidim_awesome/test/shared_examples/current_config_examples.rb +143 -0
  187. data/lib/decidim/decidim_awesome/test/shared_examples/custom_redirects_contexts.rb +47 -0
  188. data/lib/decidim/decidim_awesome/test/shared_examples/editor_examples.rb +4 -0
  189. data/lib/decidim/decidim_awesome/test/shared_examples/menu_hack_contexts.rb +0 -17
  190. data/lib/decidim/decidim_awesome/test/shared_examples/scoped_admins_examples.rb +420 -0
  191. data/lib/decidim/decidim_awesome/test/shared_examples/summary_examples.rb +202 -0
  192. data/lib/decidim/decidim_awesome/version.rb +2 -2
  193. data/lib/decidim/decidim_awesome.rb +4 -119
  194. data/lib/tasks/decidim_awesome_active_storage_migrations_tasks.rake +37 -0
  195. data/lib/tasks/decidim_awesome_webpacker_tasks.rake +64 -0
  196. data/package.json +211 -0
  197. metadata +149 -107
  198. data/app/assets/config/decidim_admin_decidim_awesome_manifest.css +0 -3
  199. data/app/assets/config/decidim_admin_decidim_awesome_manifest.js +0 -2
  200. data/app/assets/config/decidim_decidim_awesome_manifest.css +0 -5
  201. data/app/assets/config/decidim_decidim_awesome_manifest.js +0 -3
  202. data/app/assets/images/decidim/decidim_awesome/loading.gif +0 -0
  203. data/app/assets/javascripts/decidim/decidim_awesome/admin/codemirror.js.es6 +0 -15
  204. data/app/assets/javascripts/decidim/decidim_awesome/admin/constraints.js.es6 +0 -54
  205. data/app/assets/javascripts/decidim/decidim_awesome/admin.js +0 -3
  206. data/app/assets/javascripts/decidim/decidim_awesome/application.js +0 -4
  207. data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/categories.js.es6 +0 -25
  208. data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/hashtags.js.es6 +0 -48
  209. data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/layers.js.es6 +0 -106
  210. data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/legacy_map.js.es6 +0 -218
  211. data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/legacy_proposals.js.es6 +0 -83
  212. data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/map.js.es6 +0 -211
  213. data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/markers.js.es6 +0 -56
  214. data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/meetings.js.es6 +0 -132
  215. data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/proposals.js.es6 +0 -107
  216. data/app/assets/javascripts/decidim/decidim_awesome/awesome_map/utilities.js.es6 +0 -48
  217. data/app/assets/javascripts/decidim/decidim_awesome/editors/markdown_view.js.es6 +0 -12
  218. data/app/assets/javascripts/decidim/decidim_awesome/editors/quill_editor.js.es6 +0 -160
  219. data/app/assets/javascripts/decidim/decidim_awesome/proposals/images.js.es6 +0 -25
  220. data/app/assets/stylesheets/decidim/decidim_awesome/admin/codemirror.scss +0 -16
  221. data/app/assets/stylesheets/decidim/decidim_awesome/admin.scss +0 -52
  222. data/app/assets/stylesheets/decidim/decidim_awesome/application.scss +0 -8
  223. data/app/assets/stylesheets/decidim/decidim_awesome/awesome_map/leaflet.scss.erb +0 -18
  224. data/app/assets/stylesheets/decidim/decidim_awesome/awesome_map/map.scss +0 -161
  225. data/app/assets/stylesheets/decidim/decidim_awesome/editors/markdown_view.scss +0 -27
  226. data/app/assets/stylesheets/decidim/decidim_awesome/editors/quill_editor.scss +0 -7
  227. data/app/awesome_overrides/presenters/decidim/menu_presenter_override.rb +0 -39
  228. data/app/awesome_overrides/presenters/decidim/proposals/proposal_presenter_override.rb +0 -64
  229. data/app/controllers/decidim/decidim_awesome/iframe_component/application_controller.rb +0 -15
  230. data/app/controllers/decidim/decidim_awesome/map_component/application_controller.rb +0 -15
  231. data/app/views/v0.22/layouts/decidim/admin/_header.html.erb +0 -11
  232. data/app/views/v0.23/layouts/decidim/admin/_header.html.erb +0 -12
  233. data/lib/decidim/decidim_awesome/content_renderers/markdown_renderer.rb +0 -18
  234. data/lib/decidim/decidim_awesome/content_renderers.rb +0 -9
  235. data/lib/decidim/decidim_awesome/test/themes/css.lvh.me.css +0 -3
  236. data/lib/decidim/decidim_awesome/test/themes/erb.lvh.me.scss.erb +0 -2
  237. data/lib/decidim/decidim_awesome/test/themes/scss.lvh.me.scss +0 -1
  238. data/lib/decidim/decidim_awesome/test/themes/test-theme/body.scss +0 -4
  239. data/vendor/assets/images/layers-2x.png +0 -0
  240. data/vendor/assets/images/layers.png +0 -0
  241. data/vendor/assets/images/marker-icon.png +0 -0
  242. data/vendor/assets/javascripts/codemirror-4.inline-attachment.js +0 -89
  243. data/vendor/assets/javascripts/codemirror.js +0 -9801
  244. data/vendor/assets/javascripts/form-storage.js +0 -824
  245. data/vendor/assets/javascripts/highlight.min.js +0 -44
  246. data/vendor/assets/javascripts/inline-attachment.js +0 -399
  247. data/vendor/assets/javascripts/inscrybmde.min.js +0 -7
  248. data/vendor/assets/javascripts/jquery.inline-attachment.js +0 -66
  249. data/vendor/assets/javascripts/jsrender.min.js +0 -4
  250. data/vendor/assets/javascripts/keymap/sublime.js +0 -720
  251. data/vendor/assets/javascripts/leaflet.featuregroup.subgroup.js +0 -6
  252. data/vendor/assets/javascripts/mode/css/css.js +0 -864
  253. data/vendor/assets/stylesheets/codemirror.css +0 -350
  254. data/vendor/assets/stylesheets/default.min.css +0 -1
  255. data/vendor/assets/stylesheets/foundation.min.css +0 -1
  256. data/vendor/assets/stylesheets/github.min.css +0 -2
  257. data/vendor/assets/stylesheets/inscrybmde.min.scss +0 -180
@@ -0,0 +1,12 @@
1
+ # frozen_string_literal: true
2
+
3
+ class ChangeAwesomeConfigVarType < ActiveRecord::Migration[5.2]
4
+ def change
5
+ change_column :decidim_awesome_config, :var, :string
6
+
7
+ Decidim::DecidimAwesome::AwesomeConfig.find_each do |config|
8
+ config.var.gsub!('"', "")
9
+ config.save!
10
+ end
11
+ end
12
+ end
@@ -1,9 +1,13 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require "decidim/decidim_awesome/awesome_helpers"
4
+
3
5
  module Decidim
4
6
  module DecidimAwesome
5
7
  # This is the engine that runs on the public interface of `DecidimAwesome`.
6
8
  class AdminEngine < ::Rails::Engine
9
+ include AwesomeHelpers
10
+
7
11
  isolate_namespace Decidim::DecidimAwesome::Admin
8
12
 
9
13
  paths["db/migrate"] = nil
@@ -13,15 +17,16 @@ module Decidim
13
17
  # Add admin engine routes here
14
18
  resources :constraints
15
19
  resources :menu_hacks, except: [:show]
20
+ resources :custom_redirects, except: [:show]
16
21
  resources :config, param: :var, only: [:show, :update]
17
- post :new_scoped_style, to: "config#new_scoped_style"
18
- post :destroy_scoped_style, param: :key, to: "config#destroy_scoped_style"
22
+ resources :scoped_styles, param: :var, only: [:create, :destroy]
23
+ resources :proposal_custom_fields, param: :var, only: [:create, :destroy]
24
+ resources :scoped_admins, param: :var, only: [:create, :destroy]
25
+ get :users, to: "config#users"
26
+ post :rename_scope_label, to: "config#rename_scope_label"
19
27
  get :checks, to: "checks#index"
20
- root to: "config#show", var: :editors
21
- end
22
-
23
- initializer "decidim_admin_awesome.assets" do |app|
24
- app.config.assets.precompile += %w(decidim_admin_decidim_awesome_manifest.js decidim_admin_decidim_awesome_manifest.css)
28
+ post :migrate_images, to: "checks#migrate_images"
29
+ root to: "config#show"
25
30
  end
26
31
 
27
32
  initializer "decidim_decidim_awesome.admin_mount_routes" do
@@ -32,11 +37,13 @@ module Decidim
32
37
 
33
38
  initializer "decidim_awesome.admin_menu" do
34
39
  Decidim.menu :admin_menu do |menu|
35
- menu.item I18n.t("menu.decidim_awesome", scope: "decidim.admin", default: "Decidim Awesome"),
36
- decidim_admin_decidim_awesome.config_path(:editors),
37
- icon_name: "fire",
38
- position: 7.5,
39
- active: is_active_link?(decidim_admin_decidim_awesome.config_path(:editors), :inclusive)
40
+ menu.add_item :awesome_menu,
41
+ I18n.t("menu.decidim_awesome", scope: "decidim.admin", default: "Decidim Awesome"),
42
+ decidim_admin_decidim_awesome.config_path(:editors),
43
+ icon_name: "fire",
44
+ position: 7.5,
45
+ active: is_active_link?(decidim_admin_decidim_awesome.config_path(:editors), :inclusive),
46
+ if: defined?(current_user) && current_user&.read_attribute("admin")
40
47
  end
41
48
  end
42
49
 
@@ -0,0 +1,214 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module DecidimAwesome
5
+ include ActiveSupport::Configurable
6
+
7
+ autoload :Config, "decidim/decidim_awesome/config"
8
+ autoload :SystemChecker, "decidim/decidim_awesome/system_checker"
9
+ autoload :ContextAnalyzers, "decidim/decidim_awesome/context_analyzers"
10
+ autoload :MenuHacker, "decidim/decidim_awesome/menu_hacker"
11
+ autoload :CustomFields, "decidim/decidim_awesome/custom_fields"
12
+
13
+ # Awesome coms with some components for participatory spaces
14
+ # Currently :awesome_map and :awesome_iframe, list them here
15
+ # if you wan to disable them
16
+ # NOTE if you have spaces with some of these components already configured
17
+ # and then they are deactivated, it will break you application as there will be
18
+ # references in the database
19
+ #
20
+ # use only symbols here
21
+ config_accessor :disabled_components do
22
+ [
23
+ # :awesome_map,
24
+ # :awesome_iframe
25
+ ]
26
+ end
27
+
28
+ # Boolean configuration options
29
+ #
30
+ # Default values for configuration options:
31
+ # true => always true but admins can still restrict its scope
32
+ # false => default false, admins can turn it true
33
+ # :disabled => false and non available, hidden from admins
34
+ config_accessor :allow_images_in_full_editor do
35
+ false
36
+ end
37
+
38
+ config_accessor :allow_images_in_small_editor do
39
+ false
40
+ end
41
+
42
+ config_accessor :allow_images_in_proposals do
43
+ false
44
+ end
45
+
46
+ config_accessor :use_markdown_editor do
47
+ false
48
+ end
49
+
50
+ config_accessor :allow_images_in_markdown_editor do
51
+ false
52
+ end
53
+
54
+ # used to save forms in localstorage
55
+ config_accessor :auto_save_forms do
56
+ false
57
+ end
58
+
59
+ # Live chat widget linked to Telegram account or group
60
+ config_accessor :intergram_for_admins do
61
+ false
62
+ end
63
+
64
+ config_accessor :intergram_for_public do
65
+ false
66
+ end
67
+
68
+ # allows admins to created specific CSS snippets affecting only some specific parts
69
+ # Valid values differ a little from the previous convention:
70
+ # :disabled => false and non available, hidden from admins
71
+ # Hash => hash of different css text, each key will be used for the contraints
72
+ # Admins create this hash dynamically but some pre-defined css boxes can be created here as:
73
+ # {
74
+ # some_identifier: ".wrapper { background: red; }"
75
+ # }
76
+ config_accessor :scoped_styles do
77
+ {}
78
+ end
79
+
80
+ # custom fields for proposals using JSON specification:
81
+ # https://github.com/jsonform/jsonform/wiki
82
+ # Valid values uses the same structure as :scoped_styles
83
+ # :disabled => false and non available, hidden from admins
84
+ # Hash => hash of different JSON texts, each key will be used for the contraints
85
+ # Admins can create this hash dynamically but some pre-defined css boxes can be created here as:
86
+ # {
87
+ # some_identifier: "{ ... some definition... }"
88
+ # }
89
+ config_accessor :proposal_custom_fields do
90
+ {}
91
+ end
92
+
93
+ # allows to keep modifications for the main menu
94
+ # can return :disabled to completly remove this feature
95
+ # otherwise it should be an array (some overrides can be specified by default):
96
+ # [
97
+ # {
98
+ # url: "/a-new-link",
99
+ # label: { "en" => "The label to show in the menu" },
100
+ # position: 10
101
+ # }
102
+ # ]
103
+ config_accessor :menu do
104
+ []
105
+ end
106
+
107
+ # Allows admins to assignate "fake" admins scoped to some admin zones using the
108
+ # same scope editor as :scoped_styles, valid values uses the same convention:
109
+ # :disabled => false and non available, hidden from admins
110
+ # Hash => hash of different admin ids, each key will be used for the contraints
111
+ # Admins create this hash dynamically but some pre-defined admin boxes can be created here as:
112
+ # {
113
+ # some_identifier: [1234, 5678, 90123]
114
+ # }
115
+ #
116
+ # To test this feature in development, ensure that config/environmnets/development.rb is configured as:
117
+ # config.action_dispatch.show_exceptions = true
118
+ # config.action_dispatch.show_detailed_exceptions = false
119
+ # config.consider_all_requests_local = false
120
+ config_accessor :scoped_admins do
121
+ {}
122
+ end
123
+
124
+ # Allow to configure custom redirections
125
+ # can return :disabled to completly remove this feature
126
+ # You can initialize some default redirection if desired as follows:
127
+ # {
128
+ # "/decidim-docs" => { destination: "http://docs.decidim.org", active: true }
129
+ # }
130
+ #
131
+ # To test this feature in development, ensure that config/environmnets/development.rb is configured as:
132
+ # config.action_dispatch.show_exceptions = true
133
+ # config.action_dispatch.show_detailed_exceptions = false
134
+ # config.consider_all_requests_local = false
135
+
136
+ config_accessor :custom_redirects do
137
+ {}
138
+ end
139
+
140
+ # these settings do not follow the :disabled convention but
141
+ # depends on the previous intergram configurations
142
+ config_accessor :intergram_url do
143
+ "https://www.intergram.xyz/js/widget.js"
144
+ end
145
+
146
+ # no need to override these settings, there admin-configurable
147
+ config_accessor :intergram_for_admins_settings do
148
+ {
149
+ chat_id: nil,
150
+ color: nil,
151
+ use_floating_button: false,
152
+ title_closed: nil,
153
+ title_open: nil,
154
+ intro_message: nil,
155
+ auto_response: nil,
156
+ auto_no_response: nil
157
+ }
158
+ end
159
+
160
+ config_accessor :intergram_for_public_settings do
161
+ {
162
+ chat_id: nil,
163
+ require_login: true,
164
+ color: nil,
165
+ use_floating_button: false,
166
+ title_closed: nil,
167
+ title_open: nil,
168
+ intro_message: nil,
169
+ auto_response: nil,
170
+ auto_no_response: nil
171
+ }
172
+ end
173
+
174
+ # additional correspondences between participatory spaces manifests and routes
175
+ # ie: /admin/assemblies and /admin/assemblies_types are both treated as a "assembly" participatory space in terms of permission scoping
176
+ # This can be tuned in a initialized if some other hacks over routes are applied
177
+ # if a registered participatory space is not listed here then the name manifest will be used as a default route /manifest_name /admin/manifes_name
178
+ config_accessor :participatory_spaces_routes_context do
179
+ {
180
+ # route in admin is diferent than in the frontend: /processes, /admin/participatory_processes
181
+ participatory_processes: [:participatory_processes, :processes],
182
+ # both /admin/assemblies and /admin/assemblies_types are considered assemblies
183
+ assemblies: [:assemblies, :assemblies_types],
184
+ # route in admin is diferent than in the frontend: /process_groups, /admin/participatory_process_groups
185
+ process_groups: [:processes_groups, :participatory_process_groups]
186
+ }
187
+ end
188
+
189
+ #
190
+ # HELPERS
191
+ #
192
+ # pass a single config var or an array of them
193
+ # any non disabled match will return as true
194
+ def self.enabled?(config_vars)
195
+ config_vars = [config_vars] unless config_vars.respond_to?(:detect)
196
+
197
+ config_vars.detect do |item|
198
+ next unless config.has_key?(item.to_sym)
199
+
200
+ config.send(item) != :disabled
201
+ end
202
+ end
203
+
204
+ def self.registered_components
205
+ @registered_components ||= []
206
+ end
207
+
208
+ # Wrapp component registering to register component later, after initializer
209
+ # so we can honor disabled_components config
210
+ def self.register_component(manifest, &block)
211
+ registered_components << [manifest, block]
212
+ end
213
+ end
214
+ end
@@ -10,8 +10,12 @@ module Decidim
10
10
  def awesome_config_instance
11
11
  return @awesome_config_instance if @awesome_config_instance
12
12
 
13
- @awesome_config_instance = Config.new request.env["decidim.current_organization"]
14
- @awesome_config_instance.context_from_request request
13
+ # if already created in the middleware, reuse it as it might have additional constraints
14
+ @awesome_config_instance = request.env["decidim_awesome.current_config"]
15
+ unless @awesome_config_instance.is_a? Config
16
+ @awesome_config_instance = Config.new request.env["decidim.current_organization"]
17
+ @awesome_config_instance.context_from_request request
18
+ end
15
19
  @awesome_config_instance
16
20
  end
17
21
 
@@ -20,7 +24,7 @@ module Decidim
20
24
  end
21
25
 
22
26
  def javascript_config_vars
23
- awesome_config.except(:scoped_styles).to_json.html_safe
27
+ awesome_config.except(:scoped_styles, :proposal_custom_fields, :scoped_admins).to_json.html_safe
24
28
  end
25
29
 
26
30
  def show_public_intergram?
@@ -42,23 +46,19 @@ module Decidim
42
46
  ::Decidim::DecidimAwesome::VERSION
43
47
  end
44
48
 
45
- def tenant_stylesheets
46
- return @tenant_stylesheets if @tenant_stylesheets
47
-
48
- prefix = Rails.root.join("app", "assets", "themes", current_organization.host)
49
- return @tenant_stylesheets = current_organization.host.to_s if File.exist?("#{prefix}.css") || File.exist?("#{prefix}.scss") || File.exist?("#{prefix}.scss.erb")
50
- end
51
-
52
49
  # Collects all CSS that is applied in the current URL context
53
50
  def awesome_custom_styles
54
- return unless awesome_config[:scoped_styles]
55
- return @awesome_custom_styles if @awesome_custom_styles
51
+ @awesome_custom_styles ||= awesome_config_instance.collect_sub_configs_values("scoped_style")
52
+ end
56
53
 
57
- styles = awesome_config[:scoped_styles]&.filter do |key, _value|
58
- config = AwesomeConfig.find_by(var: "scoped_style_#{key}", organization: current_organization)
59
- @awesome_config_instance.valid_in_context?(config&.constraints)
60
- end
61
- @awesome_custom_styles = styles.values.join("\n")
54
+ # Collects all proposal custom fields that is applied in the current URL context
55
+ def awesome_scoped_admins
56
+ @awesome_scoped_admins ||= awesome_config_instance.collect_sub_configs_values("scoped_admin")
57
+ end
58
+
59
+ # Collects all proposal custom fields that is applied in the current URL context
60
+ def awesome_proposal_custom_fields
61
+ @awesome_proposal_custom_fields ||= awesome_config_instance.collect_sub_configs_values("proposal_custom_field")
62
62
  end
63
63
 
64
64
  def version_prefix
@@ -1,23 +1,30 @@
1
1
  decidim-admin:
2
2
  /app/views/layouts/decidim/admin/_header.html.erb:
3
- decidim-0.22: 6af51ec6b8a760b0ee6e00a7834f5f9a
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.22: bf16a58cd9e6d3f73e6875ff3d0b1e48
8
- decidim-0.23: e7f5eea07e884665474948ea750fc720
9
- /app/assets/javascripts/decidim/editor.js.es6:
10
- decidim-0.22: 797d0ec1c9e79453cf6718f82d2fdd27
11
- decidim-0.23: cb059b8ff0ffc62c67eb99d8d7a6637b
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.22: 042743c44a2aff284b493c7bebbccbb3
15
- decidim-0.23: 042743c44a2aff284b493c7bebbccbb3
12
+ decidim-0.25: f3b05daf279f909f8b3b628658dd5810
16
13
  /app/presenters/decidim/menu_item_presenter.rb:
17
- decidim-0.22: 70db39954b5840924530bf94d2a0a73a
18
- decidim-0.23: 70db39954b5840924530bf94d2a0a73a
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/presenters/decidim/proposals/proposal_presenter.rb:
21
- decidim-0.22: 7d60c8310d7fa4e38d9a27080c22b12c
22
- decidim-0.23: 437c0c25151f605401a4f14d090ba5ea
23
- decidim-0.23.1: 892021b2ce9ac10c2e1b738e6948cde0
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
- participatory_slug: nil,
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
- # if some setting is different, rejects
90
- invalid = constraint.settings.detect { |key, val| context[key.to_sym].to_s != val.to_s }
91
- invalid.blank?
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.constraints) }
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.respond_to? :rich_text_editor_in_public_views
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 = participatory_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 = participatory_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