]> source.dussan.org Git - redmine.git/commitdiff
projects / redmine.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9e07e16)
Add data-text-formatting attribute for selected markup language to body tag (#20620).
authorGo MAEDA <maeda@farend.jp>
Tue, 21 Nov 2023 01:03:43 +0000 (01:03 +0000)
committerGo MAEDA <maeda@farend.jp>
Tue, 21 Nov 2023 01:03:43 +0000 (01:03 +0000)
Patch by Go MAEDA.

git-svn-id: https://svn.redmine.org/redmine/trunk@22472 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/layouts/base.html.erb patch | blob | history
test/functional/welcome_controller_test.rb patch | blob | history

diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index bcd6622a7b5ef7db6ec3a8ca0e803c68bc08c4ab..16a640267b942e8ed64990e0a2ccfdadc484fb46 100644 (file)
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -17,7 +17,7 @@
 <!-- page specific tags -->
 <%= yield :header_tags -%>
 </head>
-<body class="<%= body_css_classes %>">
+<body class="<%= body_css_classes %>" data-text-formatting="<%= Setting.text_formatting %>">
 <%= call_hook :view_layouts_base_body_top %>
 <div id="wrapper">
 
diff --git a/test/functional/welcome_controller_test.rb b/test/functional/welcome_controller_test.rb
index 45cbc08ae15ffc144afe04bbe9f75267a964461e..d7c6741c9e861036450da577d0f751f3723fcaf8 100644 (file)
--- a/test/functional/welcome_controller_test.rb
+++ b/test/functional/welcome_controller_test.rb
@@ -117,6 +117,16 @@ class WelcomeControllerTest < Redmine::ControllerTest
     assert_select 'body.textarea-proportional'
   end
 
+  def test_data_text_setting_attribute
+    formats = %w(textile common_mark)
+    formats.each do |format|
+      with_settings text_formatting: format do
+        get :index
+        assert_select 'body[data-text-formatting=?]', format
+      end
+    end
+  end
+
   def test_logout_link_should_post
     @request.session[:user_id] = 2
 
Mirror of redmine code source: https://github.com/redmine/redmine