A platform for community discussion. Free, open, simple.
FIX: Form templates page returning 500 error (#39799)
Loïc Guitaut2501c6cd1ce1
diff --git a/app/controllers/admin/form_templates_controller.rb b/app/controllers/admin/form_templates_controller.rbindex 18cf691d10c..1b9d30eb79c 100644--- a/app/controllers/admin/form_templates_controller.rb+++ b/app/controllers/admin/form_templates_controller.rb@@ -73,8 +73,6 @@ class Admin::FormTemplatesController < Admin::StaffControllerprivatedef ensure_form_templates_enabled- unless UpcomingChanges.enabled_for_user?(:enable_form_templates, current_user)- raise Discourse::InvalidAccess.new- end+ raise Discourse::InvalidAccess.new unless SiteSetting.enable_form_templatesendenddiff --git a/app/controllers/form_templates_controller.rb b/app/controllers/form_templates_controller.rbindex 2795dafaa94..6eaf2a1768a 100644--- a/app/controllers/form_templates_controller.rb+++ b/app/controllers/form_templates_controller.rb@@ -24,8 +24,6 @@ class FormTemplatesController < ApplicationControllerprivatedef ensure_form_templates_enabled- unless UpcomingChanges.enabled_for_user?(:enable_form_templates, current_user)- raise Discourse::InvalidAccess.new- end+ raise Discourse::InvalidAccess.new unless SiteSetting.enable_form_templatesendenddiff --git a/spec/requests/admin/form_templates_controller_spec.rb b/spec/requests/admin/form_templates_controller_spec.rbindex c5ad8eba063..3d91ab7f568 100644--- a/spec/requests/admin/form_templates_controller_spec.rb+++ b/spec/requests/admin/form_templates_controller_spec.rb@@ -5,8 +5,6 @@ RSpec.describe Admin::FormTemplatesController dofab!(:user)fab!(:form_template)- before { SiteSetting.enable_form_templates = true }-describe "#index" docontext "when logged in as an admin" dobefore { sign_in(admin) }diff --git a/spec/requests/form_templates_controller_spec.rb b/spec/requests/form_templates_controller_spec.rbindex 7acdbbcf17d..3ae0f71d167 100644--- a/spec/requests/form_templates_controller_spec.rb+++ b/spec/requests/form_templates_controller_spec.rb@@ -3,8 +3,6 @@RSpec.describe FormTemplatesController dofab!(:user)- before { SiteSetting.enable_form_templates = true }-describe "#index" dofab!(:form_template)fab!(:form_template_2, :form_template)