##// END OF EJS Templates
jro_apps » redmine
RSS
Include private_notes property in xml/json Journals output (#20985)....
Jean-Philippe Lang -
r15032:0e59482e90a7
parent child
Show More
Side by Side Unified
Context file:
r15032:0e59482e90a7 Loading diff...:
Show file before | Show file after | Hide comments
@@ -59,6 +59,7 api.issue do
59 api.user(:id => journal.user_id, :name => journal.user.name) unless journal.user.nil?
59 api.user(:id => journal.user_id, :name => journal.user.name) unless journal.user.nil?
60 api.notes journal.notes
60 api.notes journal.notes
61 api.created_on journal.created_on
61 api.created_on journal.created_on
62 api.private_notes journal.private_notes
62 api.array :details do
63 api.array :details do
63 journal.visible_details.each do |detail|
64 journal.visible_details.each do |detail|
64 api.detail :property => detail.property, :name => detail.prop_key do
65 api.detail :property => detail.property, :name => detail.prop_key do
Show file before | Show file after | Hide comments
@@ -169,10 +169,13 class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
169 end
169 end
170
170
171 test "GET /issues/:id.xml with journals" do
171 test "GET /issues/:id.xml with journals" do
172 get '/issues/1.xml?include=journals'
172 Journal.find(2).update_attribute(:private_notes, true)
173
174 get '/issues/1.xml?include=journals', {}, credentials('jsmith')
173
175
174 assert_select 'issue journals[type=array]' do
176 assert_select 'issue journals[type=array]' do
175 assert_select 'journal[id="1"]' do
177 assert_select 'journal[id="1"]' do
178 assert_select 'private_notes', :text => 'false'
176 assert_select 'details[type=array]' do
179 assert_select 'details[type=array]' do
177 assert_select 'detail[name=status_id]' do
180 assert_select 'detail[name=status_id]' do
178 assert_select 'old_value', :text => '1'
181 assert_select 'old_value', :text => '1'
@@ -180,6 +183,10 class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
180 end
183 end
181 end
184 end
182 end
185 end
186 assert_select 'journal[id="2"]' do
187 assert_select 'private_notes', :text => 'true'
188 assert_select 'details[type=array]'
189 end
183 end
190 end
184 end
191 end
185
192
General Comments 0
You need to be logged in to leave comments. Login now