From 17718b5333db49c5059b4106bea1e528e531be5b Mon Sep 17 00:00:00 2001
From: ishikawa <ishikawa@farend.jp>
Date: Thu, 23 May 2019 11:37:05 +0900
Subject: [PATCH 2/2] Change the quote content

---
 app/controllers/journals_controller.rb      |  4 +++-
 app/controllers/messages_controller.rb      |  6 +++++-
 public/stylesheets/application.css          |  2 +-
 test/functional/journals_controller_test.rb |  1 +
 test/functional/messages_controller_test.rb | 18 +++++++++++++++++-
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index 4e31faea99..b598697a6e 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -66,13 +66,15 @@ class JournalsController < ApplicationController
     if @journal
       user = @journal.user
       text = @journal.notes
+      indice = @journal.issue.visible_journals_with_index.find{|j| j.id == @journal.id}.indice
+      @content = +"#{ll(Setting.default_language, :text_user_wrote_in, {:value => user, :link => "#note-#{indice}"})}\n> "
     else
       user = @issue.author
       text = @issue.description
+      @content = +"#{ll(Setting.default_language, :text_user_wrote, user)}\n> "
     end
     # Replaces pre blocks with [...]
     text = text.to_s.strip.gsub(%r{<pre>(.*?)</pre>}m, '[...]')
-    @content = +"#{ll(Setting.default_language, :text_user_wrote, user)}\n> "
     @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
   rescue ActiveRecord::RecordNotFound
     render_404
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index f0e289be24..fa8f7a4a6c 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -117,7 +117,11 @@ class MessagesController < ApplicationController
     @subject = @message.subject
     @subject = "RE: #{@subject}" unless @subject.starts_with?('RE:')
 
-    @content = +"#{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
+    if @message.root == @message
+      @content = +"#{ll(Setting.default_language, :text_user_wrote, @message.author)}\n> "
+    else
+      @content = +"#{ll(Setting.default_language, :text_user_wrote_in, {:value => @message.author, :link => "message##{@message.id}"})}\n> "
+    end
     @content << @message.content.to_s.strip.gsub(%r{<pre>(.*?)</pre>}m, '[...]').gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n"
   end
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 29750d448e..5cc524edc8 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -311,7 +311,7 @@ tr.message td.created_on { white-space: nowrap; }
 tr.message td.last_message { font-size: 80%; white-space: nowrap; }
 tr.message.sticky td.subject { font-weight: bold; }
 
-body.avatars-on #replies .message {padding-left:32px;}
+body.avatars-on #replies .message.reply {padding-left: 32px;}
 #replies .reply:target h4 {background-color:#DDEEFF;}
 #replies h4 img.gravatar {margin-left:-32px;}
 
diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb
index 3009ea5f64..a65d752e4b 100644
--- a/test/functional/journals_controller_test.rb
+++ b/test/functional/journals_controller_test.rb
@@ -185,6 +185,7 @@ class JournalsControllerTest < Redmine::ControllerTest
       :xhr => true
     assert_response :success
     assert_equal 'text/javascript', response.content_type
+    assert_include 'Redmine Admin wrote in #note-1:', response.body
     assert_include '> A comment with a private version', response.body
   end
 
diff --git a/test/functional/messages_controller_test.rb b/test/functional/messages_controller_test.rb
index be8fe4876f..48055ccbce 100644
--- a/test/functional/messages_controller_test.rb
+++ b/test/functional/messages_controller_test.rb
@@ -257,7 +257,22 @@ class MessagesControllerTest < Redmine::ControllerTest
     assert_nil Message.find_by_id(2)
   end
 
-  def test_quote
+  def test_quote_if_message_is_root
+    @request.session[:user_id] = 2
+    get :quote, :params => {
+        :board_id => 1,
+        :id => 1
+      },
+      :xhr => true
+    assert_response :success
+    assert_equal 'text/javascript', response.content_type
+
+    assert_include 'RE: First post', response.body
+    assert_include "Redmine Admin wrote:", response.body
+    assert_include '> This is the very first post\n> in the forum', response.body
+  end
+
+  def test_quote_if_message_is_not_root
     @request.session[:user_id] = 2
     get :quote, :params => {
         :board_id => 1,
@@ -268,6 +283,7 @@ class MessagesControllerTest < Redmine::ControllerTest
     assert_equal 'text/javascript', response.content_type
 
     assert_include 'RE: First post', response.body
+    assert_include 'John Smith wrote in message#3:', response.body
     assert_include '> An other reply', response.body
   end
 
-- 
2.20.1 (Apple Git-117)