##// END OF EJS Templates
Fixes project wiki copy....
Jean-Philippe Lang -
r2855:a9fb11c0f570
parent child
Show More
@@ -31,7 +31,8 class EnabledModule < ActiveRecord::Base
31 31 when 'wiki'
32 32 # Create a wiki with a default start page
33 33 if project && project.wiki.nil?
34 #Wiki.create(:project => project, :start_page => 'Wiki')
34 logger.debug("after_create module_enabled")
35 Wiki.create(:project => project, :start_page => 'Wiki')
35 36 end
36 37 end
37 38 end
@@ -412,11 +412,14 class Project < ActiveRecord::Base
412 412 to_be_copied = to_be_copied & options[:only].to_a unless options[:only].nil?
413 413
414 414 Project.transaction do
415 to_be_copied.each do |name|
416 send "copy_#{name}", project
415 if save
416 reload
417 to_be_copied.each do |name|
418 send "copy_#{name}", project
419 end
420 Redmine::Hook.call_hook(:model_project_copy_before_save, :source_project => project, :destination_project => self)
421 save
417 422 end
418 Redmine::Hook.call_hook(:model_project_copy_before_save, :source_project => project, :destination_project => self)
419 self.save
420 423 end
421 424 end
422 425
@@ -447,12 +450,16 class Project < ActiveRecord::Base
447 450
448 451 # Copies wiki from +project+
449 452 def copy_wiki(project)
450 self.wiki = Wiki.new(project.wiki.attributes.dup.except("project_id"))
451 project.wiki.pages.each do |page|
452 new_wiki_content = WikiContent.new(page.content.attributes.dup.except("page_id"))
453 new_wiki_page = WikiPage.new(page.attributes.dup.except("wiki_id"))
454 new_wiki_page.content = new_wiki_content
455 self.wiki.pages << new_wiki_page
453 # Check that the source project has a wiki first
454 unless project.wiki.nil?
455 self.wiki ||= Wiki.new
456 wiki.attributes = project.wiki.attributes.dup.except("project_id")
457 project.wiki.pages.each do |page|
458 new_wiki_content = WikiContent.new(page.content.attributes.dup.except("page_id"))
459 new_wiki_page = WikiPage.new(page.attributes.dup.except("wiki_id"))
460 new_wiki_page.content = new_wiki_content
461 wiki.pages << new_wiki_page
462 end
456 463 end
457 464 end
458 465
General Comments 0
You need to be logged in to leave comments. Login now