Skip to content

Commit

Permalink
Add links to results listing and make nav module a dependency
Browse files Browse the repository at this point in the history
In order to show editable links in the component index page,
make the nav module a dependency and show the links.
  • Loading branch information
ahukkanen committed Apr 5, 2024
1 parent 09d4bf0 commit ad2fcc7
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 1 deletion.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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: "."
Expand Down
10 changes: 10 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)

Expand Down Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,8 @@
<%== translated_attribute component_settings.intro %>
</div>
</div>
<div class="columns medium-6 mediumlarge-4">
<%= render partial: "decidim/nav/shared/action_panel_links", locals: { navigable: current_component } %>
</div>
</div>
<% end %>
1 change: 1 addition & 0 deletions decidim-accountability_simple.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "decidim-core", Decidim::AccountabilitySimple.decidim_version
spec.add_dependency "decidim-favorites", Decidim::AccountabilitySimple.decidim_version
spec.add_dependency "decidim-locations", Decidim::AccountabilitySimple.decidim_version
spec.add_dependency "decidim-nav", Decidim::AccountabilitySimple.decidim_version
spec.add_dependency "decidim-participatory_processes", Decidim::AccountabilitySimple.decidim_version
spec.add_dependency "decidim-tags", Decidim::AccountabilitySimple.decidim_version

Expand Down

0 comments on commit ad2fcc7

Please sign in to comment.