From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 16 May 2016 06:25:11 +0000 (+0000)
Subject: Include private_notes property in xml/json Journals output (#20985).
X-Git-Tag: 3.3.0~59
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0e59482e90a788f2da7775a3fb5c51dbea7b135f;p=redmine.git

Include private_notes property in xml/json Journals output (#20985).

Patch by Takenori TAKAKI.

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

diff --git a/app/views/issues/show.api.rsb b/app/views/issues/show.api.rsb
index 072709e57..f474ed9c6 100644
--- a/app/views/issues/show.api.rsb
+++ b/app/views/issues/show.api.rsb
@@ -59,6 +59,7 @@ api.issue do
         api.user(:id => journal.user_id, :name => journal.user.name) unless journal.user.nil?
         api.notes journal.notes
         api.created_on journal.created_on
+        api.private_notes journal.private_notes
         api.array :details do
           journal.visible_details.each do |detail|
             api.detail :property => detail.property, :name => detail.prop_key do
diff --git a/test/integration/api_test/issues_test.rb b/test/integration/api_test/issues_test.rb
index 8b23dccc8..b1e189181 100644
--- a/test/integration/api_test/issues_test.rb
+++ b/test/integration/api_test/issues_test.rb
@@ -169,10 +169,13 @@ class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
   end
 
   test "GET /issues/:id.xml with journals" do
-    get '/issues/1.xml?include=journals'
+    Journal.find(2).update_attribute(:private_notes, true)
+
+    get '/issues/1.xml?include=journals', {}, credentials('jsmith')
 
     assert_select 'issue journals[type=array]' do
       assert_select 'journal[id="1"]' do
+        assert_select 'private_notes', :text => 'false'
         assert_select 'details[type=array]' do
           assert_select 'detail[name=status_id]' do
             assert_select 'old_value', :text => '1'
@@ -180,6 +183,10 @@ class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
           end
         end
       end
+      assert_select 'journal[id="2"]' do
+        assert_select 'private_notes', :text => 'true'
+        assert_select 'details[type=array]'
+      end
     end
   end