diff --git a/Gemfile b/Gemfile index d0a556b..3d3e213 100644 --- a/Gemfile +++ b/Gemfile @@ -16,6 +16,7 @@ gem "decidim", DECIDIM_VERSION gem "decidim-apifiles", github: "mainio/decidim-module-apifiles", branch: "main" gem "decidim-favorites", github: "mainio/decidim-module-favorites", branch: "develop" gem "decidim-locations", github: "mainio/decidim-module-locations", branch: "develop" +gem "decidim-nav", github: "mainio/decidim-module-nav", branch: "main" gem "decidim-tags", github: "mainio/decidim-module-tags", branch: "main" gem "decidim-accountability_simple", path: "." diff --git a/Gemfile.lock b/Gemfile.lock index 52aaa7e..a6a1d5f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,6 +24,14 @@ GIT rgeo (= 3.0.1) rgeo-geojson (= 2.1.1) +GIT + remote: https://github.com/mainio/decidim-module-nav.git + revision: f16cb0ef4d822477df4651d0ecc21d130253941e + branch: main + specs: + decidim-nav (0.27.0) + decidim-core (~> 0.27.0) + GIT remote: https://github.com/mainio/decidim-module-tags.git revision: f42f1a2d1b7f19228529f011b77285070202b538 @@ -42,6 +50,7 @@ PATH decidim-core (~> 0.27.0) decidim-favorites (~> 0.27.0) decidim-locations (~> 0.27.0) + decidim-nav (~> 0.27.0) decidim-participatory_processes (~> 0.27.0) decidim-tags (~> 0.27.0) @@ -848,6 +857,7 @@ DEPENDENCIES decidim-dev (~> 0.27.0) decidim-favorites! decidim-locations! + decidim-nav! decidim-tags! faker (~> 2.14) letter_opener_web (~> 2.0) diff --git a/Rakefile b/Rakefile index ae282be..93753f3 100644 --- a/Rakefile +++ b/Rakefile @@ -8,8 +8,9 @@ def install_module(path) system("bundle exec rails decidim_favorites:install:migrations") system("bundle exec rails decidim_locations:install:migrations") system("bundle exec rails decidim_tags:install:migrations") - system("bundle exec rails decidim_accountability_simple:install:migrations") + system("bundle exec rails decidim_nav:install:migrations") system("bundle exec rails decidim_apifiles:install:migrations") + system("bundle exec rails decidim_accountability_simple:install:migrations") system("bundle exec rails db:migrate") # Temporary fix to overcome the issue with sass-embedded, see: diff --git a/app/views/decidim/accountability/results/_listing_intro.html.erb b/app/views/decidim/accountability/results/_listing_intro.html.erb index 19cebd7..3499c74 100644 --- a/app/views/decidim/accountability/results/_listing_intro.html.erb +++ b/app/views/decidim/accountability/results/_listing_intro.html.erb @@ -13,5 +13,8 @@ <%== translated_attribute component_settings.intro %> +