jro_apps/redmine Commit - r14748:f4bcb1286e21

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)....

Jean-Philippe Lang -

r14748:f4bcb1286e21

parent child

Context file:

r14748:f4bcb1286e21

app/models/wiki_page.rb +1 -1

                      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

test/unit/wiki_page_test.rb +18 0

                  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

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages