Merge remote-tracking branch 'upstream/pull/5075'

app/assets/javascripts/richtext.js

@@ -8,6 +8,10 @@ $(document).ready(function () {
     var container = $(this).closest(".richtext_container");
 
     container.find(".tab-pane[id$='_preview']").empty();
+  }).on("invalid", function () {
+    var container = $(this).closest(".richtext_container");
+
+    container.find("button[data-bs-target$='_edit']").tab("show");
   });
 
   /*

test/system/rich_text_test.rb

@@ -0,0 +1,16 @@
+require "application_system_test_case"
+
+class RichTextSystemTest < ApplicationSystemTestCase
+  def setup
+    create(:language, :code => "en")
+  end
+
+  test "switches to edit pane on validation failure" do
+    sign_in_as create(:user)
+    visit new_diary_entry_path
+    fill_in "Subject", :with => "My Diary Entry Title"
+    click_on "Preview"
+    click_on "Publish"
+    assert_field "Body"
+  end
+end