Skip to content

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.rb
index 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::StaffController
private
def 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_templates
end
end
diff --git a/app/controllers/form_templates_controller.rb b/app/controllers/form_templates_controller.rb
index 2795dafaa94..6eaf2a1768a 100644
--- a/app/controllers/form_templates_controller.rb
+++ b/app/controllers/form_templates_controller.rb
@@ -24,8 +24,6 @@ class FormTemplatesController < ApplicationController
private
def 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_templates
end
end
diff --git a/spec/requests/admin/form_templates_controller_spec.rb b/spec/requests/admin/form_templates_controller_spec.rb
index 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 do
fab!(:user)
fab!(:form_template)
- before { SiteSetting.enable_form_templates = true }
-
describe "#index" do
context "when logged in as an admin" do
before { sign_in(admin) }
diff --git a/spec/requests/form_templates_controller_spec.rb b/spec/requests/form_templates_controller_spec.rb
index 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 do
fab!(:user)
- before { SiteSetting.enable_form_templates = true }
-
describe "#index" do
fab!(:form_template)
fab!(:form_template_2, :form_template)