##// END OF EJS Templates
Merged r11332 from trunk (#13097)....
Jean-Philippe Lang -
r11134:ecef96a6b9e3
parent child
Show More
@@ -731,7 +731,7 class Project < ActiveRecord::Base
731 def copy_wiki(project)
731 def copy_wiki(project)
732 # Check that the source project has a wiki first
732 # Check that the source project has a wiki first
733 unless project.wiki.nil?
733 unless project.wiki.nil?
734 self.wiki ||= Wiki.new
734 wiki = self.wiki || Wiki.new
735 wiki.attributes = project.wiki.attributes.dup.except("id", "project_id")
735 wiki.attributes = project.wiki.attributes.dup.except("id", "project_id")
736 wiki_pages_map = {}
736 wiki_pages_map = {}
737 project.wiki.pages.each do |page|
737 project.wiki.pages.each do |page|
@@ -743,6 +743,8 class Project < ActiveRecord::Base
743 wiki.pages << new_wiki_page
743 wiki.pages << new_wiki_page
744 wiki_pages_map[page.id] = new_wiki_page
744 wiki_pages_map[page.id] = new_wiki_page
745 end
745 end
746
747 self.wiki = wiki
746 wiki.save
748 wiki.save
747 # Reproduce page hierarchy
749 # Reproduce page hierarchy
748 project.wiki.pages.each do |page|
750 project.wiki.pages.each do |page|
General Comments 0
You need to be logged in to leave comments. Login now