Backport 'Fix decidim-templates usage' to v0.26 (#12601)

* Fix decidim-templates usage * Fix decidim-templates usage * Apply review recommendations * Remove unexisting helper in this version * Remove unused i18n string --------- Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
decidim · Mar 15, 2024 · f2e8d50 · f2e8d50
1 parent d9bdfcd
commit f2e8d50
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 5 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -195,7 +195,6 @@ PATH
     decidim-surveys (0.26.9)
       decidim-core (= 0.26.9)
       decidim-forms (= 0.26.9)
-      decidim-templates (= 0.26.9)
     decidim-system (0.26.9)
       active_link_to (~> 1.0)
       decidim-core (= 0.26.9)

diff --git a/decidim-admin/app/controllers/decidim/admin/application_controller.rb b/decidim-admin/app/controllers/decidim/admin/application_controller.rb
@@ -29,6 +29,7 @@ class ApplicationController < ::DecidimController
       helper Decidim::LanguageChooserHelper
       helper Decidim::ComponentPathHelper
       helper Decidim::SanitizeHelper
+      helper Decidim::Templates::Admin::ApplicationHelper if Decidim.module_installed?(:templates) && defined?(Decidim::Templates::Admin::ApplicationHelper)
 
       default_form_builder Decidim::Admin::FormBuilder
 

diff --git a/decidim-forms/app/controllers/decidim/forms/admin/concerns/has_questionnaire.rb b/decidim-forms/app/controllers/decidim/forms/admin/concerns/has_questionnaire.rb
@@ -20,7 +20,7 @@ module HasQuestionnaire
             helper_method :questionnaire_for, :questionnaire, :blank_question, :blank_answer_option, :blank_matrix_row,
                           :blank_display_condition, :question_types, :display_condition_types, :update_url, :public_url, :answer_options_url, :edit_questionnaire_title
 
-            if defined? Decidim::Templates::Admin
+            if defined?(Decidim::Templates::Admin::Concerns::Templatable)
               include Decidim::Templates::Admin::Concerns::Templatable
               helper Decidim::Templates::Admin::TemplatesHelper
 

diff --git a/decidim-generators/Gemfile.lock b/decidim-generators/Gemfile.lock
@@ -185,7 +185,6 @@ PATH
     decidim-surveys (0.26.9)
       decidim-core (= 0.26.9)
       decidim-forms (= 0.26.9)
-      decidim-templates (= 0.26.9)
     decidim-system (0.26.9)
       active_link_to (~> 1.0)
       decidim-core (= 0.26.9)

diff --git a/decidim-surveys/decidim-surveys.gemspec b/decidim-surveys/decidim-surveys.gemspec
@@ -22,9 +22,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency "decidim-core", Decidim::Surveys.version
   s.add_dependency "decidim-forms", Decidim::Surveys.version
-  s.add_dependency "decidim-templates", Decidim::Surveys.version
 
   s.add_development_dependency "decidim-admin", Decidim::Surveys.version
   s.add_development_dependency "decidim-dev", Decidim::Surveys.version
   s.add_development_dependency "decidim-participatory_processes", Decidim::Surveys.version
+  s.add_development_dependency "decidim-templates", Decidim::Surveys.version
 end
diff --git a/decidim_app-design/Gemfile.lock b/decidim_app-design/Gemfile.lock
@@ -195,7 +195,6 @@ PATH
     decidim-surveys (0.26.9)
       decidim-core (= 0.26.9)
       decidim-forms (= 0.26.9)
-      decidim-templates (= 0.26.9)
     decidim-system (0.26.9)
       active_link_to (~> 1.0)
       decidim-core (= 0.26.9)