meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-10-17 17:01:01 +00:00
Code Issues Releases Wiki Activity

Fixed that moving a wiki page with a child raises an error when target wiki contains a page with the same name as the child (#21900).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@15130 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-01-30 15:12:13 +00:00
parent c263d8030a
commit f4bcb1286e
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/wiki_page.rb
View File

@ -126,7 +126,7 @@ class WikiPage < ActiveRecord::Base
child.wiki_id = wiki_id
child.redirect_existing_links = redirect_existing_links
unless child.save
WikiPage.where(:id => child.id).update_all :parent_nil => nil
WikiPage.where(:id => child.id).update_all :parent_id => nil
end
end
end

18
test/unit/wiki_page_test.rb
View File

@ -121,6 +121,24 @@ class WikiPageTest < ActiveSupport::TestCase
assert_equal parent, child.parent
end
def test_move_parent_with_child_with_duplicate_name_should_not_move_child
parent = WikiPage.create!(:wiki_id => 1, :title => 'Parent')
child = WikiPage.create!(:wiki_id => 1, :title => 'Child', :parent_id => parent.id)
parent.reload
# page with the same name as the child in the target wiki
WikiPage.create!(:wiki_id => 2, :title => 'Child')
parent.wiki_id = 2
parent.save!
parent.reload
assert_equal 2, parent.wiki_id
child.reload
assert_equal 1, child.wiki_id
assert_nil child.parent_id
end
def test_destroy
page = WikiPage.find(1)
page.destroy