diff options
| author | Marius Balteanu <marius.balteanu@zitec.com> | 2022-02-20 15:53:12 +0000 |
|---|---|---|
| committer | Marius Balteanu <marius.balteanu@zitec.com> | 2022-02-20 15:53:12 +0000 |
| commit | 5bc98c7b2e009e5516ebd9350f372eaffcffb959 (patch) | |
| tree | c3c196582801a9b5d113101da504f129c315a25f | |
| parent | 022d9a1254c4c7dfd043e1f56d7b4afc52baad3b (diff) | |
| download | redmine-5bc98c7b2e009e5516ebd9350f372eaffcffb959.tar.gz redmine-5bc98c7b2e009e5516ebd9350f372eaffcffb959.zip | |
Merged r21414 to 4.1-stable (#36494).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@21421 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/wiki/show.api.rsb | 2 | ||||
| -rw-r--r-- | test/integration/api_test/wiki_pages_test.rb | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/app/views/wiki/show.api.rsb b/app/views/wiki/show.api.rsb index 8e082e123..6165a94cc 100644 --- a/app/views/wiki/show.api.rsb +++ b/app/views/wiki/show.api.rsb @@ -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 diff --git a/test/integration/api_test/wiki_pages_test.rb b/test/integration/api_test/wiki_pages_test.rb index ae980129f..828c033f1 100644 --- a/test/integration/api_test/wiki_pages_test.rb +++ b/test/integration/api_test/wiki_pages_test.rb @@ -119,6 +119,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 'WikiContent::Version.count' do |