From: Go MAEDA <maeda@farend.jp>
Date: Fri, 21 Jun 2019 07:23:16 +0000 (+0000)
Subject: Fix missing journal indice when updating a journal (#31427).
X-Git-Tag: 4.1.0~758
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=af987c9ed48da60139ff168db1bb6bfc43c0ff5f;p=redmine.git

Fix missing journal indice when updating a journal (#31427).

Patch by Marius BALTEANU.


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

diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index 809afb4cc..391a432d9 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -30,8 +30,9 @@ module JournalsHelper
     links = []
     if journal.notes.present?
       if options[:reply_links]
+        indice = journal.indice || @journal.issue.visible_journals_with_index.find{|j| j.id == @journal.id}.indice
         links << link_to(l(:button_quote),
-                         quoted_issue_path(issue, :journal_id => journal, :journal_indice => journal.indice),
+                         quoted_issue_path(issue, :journal_id => journal, :journal_indice => indice),
                          :remote => true,
                          :method => 'post',
                          :title => l(:button_quote),
diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb
index 0acf2d966..c2a21bc5d 100644
--- a/test/functional/journals_controller_test.rb
+++ b/test/functional/journals_controller_test.rb
@@ -257,6 +257,8 @@ class JournalsControllerTest < Redmine::ControllerTest
     assert_equal 'text/javascript', response.content_type
     assert_equal 'Updated notes', Journal.find(2).notes
     assert_include 'journal-2-notes', response.body
+    # response should include journal_indice param for quote link
+    assert_include 'journal_indice=2', response.body
   end
 
   def test_update_xhr_with_private_notes_checked