A platform for community discussion. Free, open, simple.
FIX: Return a validation error for invalid pluralized email templates (#42450)
Gabriel Grubba88f0ddbfac6d
diff --git a/app/controllers/admin/email_templates_controller.rb b/app/controllers/admin/email_templates_controller.rbindex 0b651bcb4de..7d1bd53fef3 100644--- a/app/controllers/admin/email_templates_controller.rb+++ b/app/controllers/admin/email_templates_controller.rb@@ -163,12 +163,8 @@ class Admin::EmailTemplatesController < Admin::AdminControllerrest_serializer: true,)else- TranslationOverride.upsert!(- I18n.locale,- "#{key}.subject_template",- subject_result[:old_value],- )- TranslationOverride.upsert!(I18n.locale, "#{key}.text_body_template", body_result[:old_value])+ restore_key(subject_result)+ restore_key(body_result)render_json_error(error_messages)end@@ -201,12 +197,23 @@ class Admin::EmailTemplatesController < Admin::AdminControllerdef update_key(key, value)old_value = I18n.t(key)+ has_override = TranslationOverride.exists?(locale: I18n.locale, translation_key: key)unless old_value.is_a?(Hash)translation_override = TranslationOverride.upsert!(I18n.locale, key, value)end- { key:, old_value:, error_messages: translation_override&.errors&.full_messages }+ { key:, old_value:, has_override:, error_messages: translation_override&.errors&.full_messages }+ end++ def restore_key(update_result)+ return if update_result[:old_value].is_a?(Hash)++ if update_result[:has_override]+ TranslationOverride.upsert!(I18n.locale, update_result[:key], update_result[:old_value])+ else+ TranslationOverride.revert!(I18n.locale, update_result[:key])+ endenddef revert_and_log(*keys)diff --git a/spec/requests/admin/email_templates_controller_spec.rb b/spec/requests/admin/email_templates_controller_spec.rbindex 95ba1812a55..b5f390ec6d3 100644--- a/spec/requests/admin/email_templates_controller_spec.rb+++ b/spec/requests/admin/email_templates_controller_spec.rb@@ -357,7 +357,7 @@ RSpec.describe Admin::EmailTemplatesController doendend- context "when subject has plural keys" do+ context "when subject or body has plural keys" doit "doesn't update the subject" doold_subject = I18n.t("system_messages.pending_users_reminder.subject_template")expect(old_subject).to be_a(Hash)@@ -380,6 +380,54 @@ RSpec.describe Admin::EmailTemplatesController do"Lorem ipsum",)end++ it "returns validation errors without creating overrides for pluralized templates" do+ templates = [+ {+ key: "system_messages.pending_users_reminder",+ subject: "",+ body: "Body with %{invalid} interpolation key",+ invalid_attribute: "Body",+ },+ {+ key: "system_messages.reviewables_reminder",+ subject: "Subject with %{invalid} interpolation key",+ body: "",+ invalid_attribute: "Subject",+ },+ ]++ templates.each do |template|+ subject_key = "#{template[:key]}.subject_template"+ body_key = "#{template[:key]}.text_body_template"+ expect([I18n.t(subject_key), I18n.t(body_key)]).to include(be_a(Hash))++ put "/admin/email/templates/#{template[:key]}",+ params: {+ email_template: template.slice(:subject, :body),+ },+ headers: headers++ expect(response.status).to eq(422)+ expect(response.parsed_body["errors"]).to eq(+ [+ "<b>#{template[:invalid_attribute]}</b>: #{+ I18n.t(+ "activerecord.errors.models.translation_overrides.attributes.value.invalid_interpolation_keys",+ keys: "invalid",+ count: 1,+ )+ }",+ ],+ )+ expect(+ TranslationOverride.where(+ locale: I18n.locale,+ translation_key: [subject_key, body_key],+ ),+ ).to be_empty+ end+ endendend