@@ -95,7 +95,7 @@ class Site < ActiveRecord::Base end def add_pages - if connection.select_value("SELECT count(*) from pages where site_id=#{id}").to_i == 0 + if Page.table_exists? require Rails.root + "/db/migrate/20080722143227_move_system_content_to_pages" MoveSystemContentToPages.up end app/models/site.rb @@ -5,7 +5,9 @@ class MoveSystemContentToPages < ActiveRecord::Migration html = File.read(filename) path, filename = filename.split('pages/').last.split('/') pub = nav = path != 'system' - Page.create!(:slug => path, :title => path.titleize, :body => html, :system => true, :navigation => nav, :published => pub) + unless Page.find_by_path(path) + Page.create!(:slug => path, :title => path.titleize, :body => html, :system => true, :navigation => nav, :published => pub) + end end Dir[File.dirname(__FILE__) + "/20080722143227_move_system_content_to_pages/**/*.html"].each do |filename| next if filename =~ /index\.html$/ @@ -13,7 +15,10 @@ class MoveSystemContentToPages < ActiveRecord::Migration path, filename = filename.split('pages/').last.split('/') slug = filename.split('.').first nav = path != 'system' - Page.find_by_path(path).children.create!(:slug => slug, :title => slug.titleize, :body => html, :system => true, :navigation => nav, :published => true) + parent = Page.find_by_path(path) + unless parent.children.find_by_slug(slug) + parent.children.create!(:slug => slug, :title => slug.titleize, :body => html, :system => true, :navigation => nav, :published => true) + end end unless Page.find_by_path('home') Page.create!(:slug => 'home', :title => 'Home', :body => 'Congratulations! OneBody is up and running.', :system => true) db/migrate/20080722143227_move_system_content_to_pages.rb 75034c80e44a35a8d47de01128e67db22c01f0c7 Tim Morgan tim@timmorgan.org http://github.com/seven1m/onebody/commit/e14a3a39fdaece81684f1df6ceab5ec67f3117c1 e14a3a39fdaece81684f1df6ceab5ec67f3117c1 2008-08-17T19:16:07-07:00 2008-08-17T19:16:07-07:00 Fix broken pages migration (again). Don't duplicate page when creating a new site. d58e29b9e5c991f11a34fd8fda757e9d96275309 Tim Morgan tim@timmorgan.org