From 81bf1f796a188011408f87e073fecb19faa2cb36 Mon Sep 17 00:00:00 2001 From: quentinchampenois <26109239+Quentinchampenois@users.noreply.github.com> Date: Tue, 16 Jan 2024 10:33:21 +0100 Subject: [PATCH 1/8] fix: Add nokogiri required dependency --- decidim-gallery.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/decidim-gallery.gemspec b/decidim-gallery.gemspec index 0898ed8..0606579 100644 --- a/decidim-gallery.gemspec +++ b/decidim-gallery.gemspec @@ -21,6 +21,7 @@ Gem::Specification.new do |s| s.add_dependency "decidim-admin", ">= 0.26.0", "< 0.28.0" s.add_dependency "decidim-core", ">= 0.26.0", "< 0.28.0" s.add_dependency "deface", "~> 1.9" + s.add_dependency "nokogiri" s.add_development_dependency "decidim-participatory_processes", ">= 0.26.0", "< 0.28.0" s.metadata["rubygems_mfa_required"] = "true" end From c1df30d76c13a046af7820a0fe1c4ce742d6801d Mon Sep 17 00:00:00 2001 From: quentinchampenois <26109239+Quentinchampenois@users.noreply.github.com> Date: Fri, 19 Jan 2024 08:38:22 +0100 Subject: [PATCH 2/8] fix: deactivate Deface --- lib/decidim/gallery/engine.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/decidim/gallery/engine.rb b/lib/decidim/gallery/engine.rb index b745e71..e9cb539 100644 --- a/lib/decidim/gallery/engine.rb +++ b/lib/decidim/gallery/engine.rb @@ -15,11 +15,11 @@ class Engine < ::Rails::Engine root to: "gallery#index" end - initializer "decidim_gallery.deface" do - Rails.application.configure do - config.deface.enabled = true - end - end + #initializer "decidim_gallery.deface" do + # Rails.application.configure do + # config.deface.enabled = true + # end + #end initializer "decidim_gallery.webpacker.assets_path" do Decidim.register_assets_path File.expand_path("app/packs", root) From 8a29cf416c4862748053e00ff5ab58316512e25a Mon Sep 17 00:00:00 2001 From: quentinchampenois <26109239+Quentinchampenois@users.noreply.github.com> Date: Fri, 19 Jan 2024 10:45:25 +0100 Subject: [PATCH 3/8] revert: Nokogiri dependency --- decidim-gallery.gemspec | 1 - 1 file changed, 1 deletion(-) diff --git a/decidim-gallery.gemspec b/decidim-gallery.gemspec index 0606579..0898ed8 100644 --- a/decidim-gallery.gemspec +++ b/decidim-gallery.gemspec @@ -21,7 +21,6 @@ Gem::Specification.new do |s| s.add_dependency "decidim-admin", ">= 0.26.0", "< 0.28.0" s.add_dependency "decidim-core", ">= 0.26.0", "< 0.28.0" s.add_dependency "deface", "~> 1.9" - s.add_dependency "nokogiri" s.add_development_dependency "decidim-participatory_processes", ">= 0.26.0", "< 0.28.0" s.metadata["rubygems_mfa_required"] = "true" end From 1cac9716405db07c02645f052033ac481926e050 Mon Sep 17 00:00:00 2001 From: quentinchampenois <26109239+Quentinchampenois@users.noreply.github.com> Date: Fri, 19 Jan 2024 11:34:19 +0100 Subject: [PATCH 4/8] fix: Add deface dependency --- lib/decidim/gallery/engine.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/decidim/gallery/engine.rb b/lib/decidim/gallery/engine.rb index e9cb539..ba26190 100644 --- a/lib/decidim/gallery/engine.rb +++ b/lib/decidim/gallery/engine.rb @@ -2,6 +2,7 @@ require "rails" require "decidim/core" +require "deface" module Decidim module Gallery From bd5751df05087d8781a26e8f48c4fab8e0903c81 Mon Sep 17 00:00:00 2001 From: quentinchampenois <26109239+Quentinchampenois@users.noreply.github.com> Date: Fri, 19 Jan 2024 11:43:27 +0100 Subject: [PATCH 5/8] fix: require nokogiri --- lib/decidim/gallery/engine.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/decidim/gallery/engine.rb b/lib/decidim/gallery/engine.rb index ba26190..1fb8cd6 100644 --- a/lib/decidim/gallery/engine.rb +++ b/lib/decidim/gallery/engine.rb @@ -2,6 +2,7 @@ require "rails" require "decidim/core" +require "nokogiri" require "deface" module Decidim From 16b6e90a83451b9372d326690decd13bd3c7d06f Mon Sep 17 00:00:00 2001 From: quentinchampenois <26109239+Quentinchampenois@users.noreply.github.com> Date: Fri, 19 Jan 2024 14:35:57 +0100 Subject: [PATCH 6/8] fix: Remove deface requirement --- lib/decidim/gallery.rb | 1 - lib/decidim/gallery/engine.rb | 2 -- 2 files changed, 3 deletions(-) diff --git a/lib/decidim/gallery.rb b/lib/decidim/gallery.rb index a9f01f4..6802ab0 100644 --- a/lib/decidim/gallery.rb +++ b/lib/decidim/gallery.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require "deface" require "decidim/gallery/admin" require "decidim/gallery/engine" require "decidim/gallery/admin_engine" diff --git a/lib/decidim/gallery/engine.rb b/lib/decidim/gallery/engine.rb index 1fb8cd6..e9cb539 100644 --- a/lib/decidim/gallery/engine.rb +++ b/lib/decidim/gallery/engine.rb @@ -2,8 +2,6 @@ require "rails" require "decidim/core" -require "nokogiri" -require "deface" module Decidim module Gallery From 726fab33984c3adeec30cf90d0e1b4ad3881787d Mon Sep 17 00:00:00 2001 From: quentinchampenois <26109239+Quentinchampenois@users.noreply.github.com> Date: Fri, 19 Jan 2024 14:47:43 +0100 Subject: [PATCH 7/8] fix: Remove Deface dependency --- decidim-gallery.gemspec | 1 - 1 file changed, 1 deletion(-) diff --git a/decidim-gallery.gemspec b/decidim-gallery.gemspec index 0898ed8..34f5580 100644 --- a/decidim-gallery.gemspec +++ b/decidim-gallery.gemspec @@ -20,7 +20,6 @@ Gem::Specification.new do |s| s.add_dependency "decidim-admin", ">= 0.26.0", "< 0.28.0" s.add_dependency "decidim-core", ">= 0.26.0", "< 0.28.0" - s.add_dependency "deface", "~> 1.9" s.add_development_dependency "decidim-participatory_processes", ">= 0.26.0", "< 0.28.0" s.metadata["rubygems_mfa_required"] = "true" end From 0ce98eeade3f86055782522ab9aa0339183eaa6e Mon Sep 17 00:00:00 2001 From: Guillaume MORET <90462045+AyakorK@users.noreply.github.com> Date: Mon, 10 Feb 2025 10:09:41 +0100 Subject: [PATCH 8/8] fix: Move the helper loading (#23) * fix: Move the helper loading as it occured issues when Decidim:Controller was not loaded * fix: Allow tests to run and fix lint * fix: Allow i18n tests to run --- .github/workflows/i18n.yml | 2 +- .github/workflows/test.yml | 2 +- lib/decidim/gallery/engine.rb | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/i18n.yml b/.github/workflows/i18n.yml index 9afe4ea..086096a 100644 --- a/.github/workflows/i18n.yml +++ b/.github/workflows/i18n.yml @@ -50,7 +50,7 @@ jobs: SIMPLECOV: 0 CODECOV: 0 - - uses: actions/upload-artifact@v2-preview + - uses: actions/upload-artifact@v4 if: always() with: name: screenshots diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c020325..8856946 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,7 +63,7 @@ jobs: SIMPLECOV: 1 CODECOV: 1 - - uses: actions/upload-artifact@v2-preview + - uses: actions/upload-artifact@v4 if: always() with: name: screenshots diff --git a/lib/decidim/gallery/engine.rb b/lib/decidim/gallery/engine.rb index e9cb539..c77fa73 100644 --- a/lib/decidim/gallery/engine.rb +++ b/lib/decidim/gallery/engine.rb @@ -15,11 +15,11 @@ class Engine < ::Rails::Engine root to: "gallery#index" end - #initializer "decidim_gallery.deface" do + # initializer "decidim_gallery.deface" do # Rails.application.configure do # config.deface.enabled = true # end - #end + # end initializer "decidim_gallery.webpacker.assets_path" do Decidim.register_assets_path File.expand_path("app/packs", root) @@ -33,12 +33,15 @@ class Engine < ::Rails::Engine initializer "decidim_gallery.action_controller" do Rails.application.reloader.to_prepare do ActiveSupport.on_load :action_controller do - ::Decidim::Admin::StaticPagesController.helper Decidim::Gallery::Admin::ApplicationHelper ::Decidim::Admin::StaticPageForm.prepend Decidim::Gallery::Admin::StaticPages::Form ::Decidim::Admin::CreateStaticPage.prepend Decidim::Gallery::Admin::StaticPages::Command ::Decidim::Admin::UpdateStaticPage.prepend Decidim::Gallery::Admin::StaticPages::Command end end + + config.after_initialize do + ::Decidim::Admin::StaticPagesController.helper Decidim::Gallery::Admin::ApplicationHelper + end end initializer "decidim_gallery.register_blocks" do