Skip to content

Commit

Permalink
Fix WikiContentVersion API returns 500 if author is nil (#36494).
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.redmine.org/redmine/trunk@21414 e93f8b46-1217-0410-a6f0-8f06a7374b81
  • Loading branch information
marius-balteanu committed Feb 18, 2022
1 parent d8263dc commit 9f82265
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
2 changes: 1 addition & 1 deletion app/views/wiki/show.api.rsb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ api.wiki_page do
end
api.text @content.text
api.version @content.version
api.author(:id => @content.author_id, :name => @content.author.name)
api.author(:id => @content.author_id, :name => @content.author.name) unless @content.author_id.nil?
api.comments @content.comments
api.created_on @page.created_on
api.updated_on @content.updated_on
Expand Down
11 changes: 11 additions & 0 deletions test/integration/api_test/wiki_pages_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,17 @@ class Redmine::ApiTest::WikiPagesTest < Redmine::ApiTest::Base
assert_equal 'jsmith', page.content.author.login
end

test "GET /projects/:project_id/wiki/:title/:version.xml should not includ author if not exists" do
WikiContentVersion.find_by_id(2).update(author_id: nil)

get '/projects/ecookbook/wiki/CookBook_documentation/2.xml'
assert_response 200
assert_equal 'application/xml', response.media_type
assert_select 'wiki_page' do
assert_select 'author', 0
end
end

test "PUT /projects/:project_id/wiki/:title.xml with current versino should update wiki page" do
assert_no_difference 'WikiPage.count' do
assert_difference 'WikiContentVersion.count' do
Expand Down

0 comments on commit 9f82265

Please sign in to comment.