mirror of
https://github.com/redmine/redmine.git
synced 2025-11-08 06:15:59 +01:00
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
This commit is contained in:
@@ -59,6 +59,7 @@ api.issue do
|
|||||||
api.user(:id => journal.user_id, :name => journal.user.name) unless journal.user.nil?
|
api.user(:id => journal.user_id, :name => journal.user.name) unless journal.user.nil?
|
||||||
api.notes journal.notes
|
api.notes journal.notes
|
||||||
api.created_on journal.created_on
|
api.created_on journal.created_on
|
||||||
|
api.private_notes journal.private_notes
|
||||||
api.array :details do
|
api.array :details do
|
||||||
journal.visible_details.each do |detail|
|
journal.visible_details.each do |detail|
|
||||||
api.detail :property => detail.property, :name => detail.prop_key do
|
api.detail :property => detail.property, :name => detail.prop_key do
|
||||||
|
|||||||
@@ -169,10 +169,13 @@ class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
|
|||||||
end
|
end
|
||||||
|
|
||||||
test "GET /issues/:id.xml with journals" do
|
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 'issue journals[type=array]' do
|
||||||
assert_select 'journal[id="1"]' do
|
assert_select 'journal[id="1"]' do
|
||||||
|
assert_select 'private_notes', :text => 'false'
|
||||||
assert_select 'details[type=array]' do
|
assert_select 'details[type=array]' do
|
||||||
assert_select 'detail[name=status_id]' do
|
assert_select 'detail[name=status_id]' do
|
||||||
assert_select 'old_value', :text => '1'
|
assert_select 'old_value', :text => '1'
|
||||||
@@ -180,6 +183,10 @@ class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
assert_select 'journal[id="2"]' do
|
||||||
|
assert_select 'private_notes', :text => 'true'
|
||||||
|
assert_select 'details[type=array]'
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user