@@ -67,7 +67,7 @@ class Site < ActiveRecord::Base Setting.get(:features, :multisite) or default? end - after_create :add_settings, :add_tasks + after_create :add_settings, :add_tasks, :add_pages def add_settings settings = YAML::load(File.open(SETTINGS_YAML_FILE)) @@ -94,6 +94,13 @@ class Site < ActiveRecord::Base ].each { |t| self.scheduled_tasks.create!(t) unless self.scheduled_tasks.find_by_name(t[:name]) } end + def add_pages + if connection.select_value("SELECT count(*) from pages where site_id=#{id}").to_i == 0 + require Rails.root + "/db/migrate/20080722143227_move_system_content_to_pages" + MoveSystemContentToPages.up + end + end + def twitter_enabled? @twitter_enabled ||= self.settings.find_by_name('Twitter Account').value.to_s.any? \ && self.settings.find_by_name('Twitter Password').value.to_s.any? app/models/site.rb @@ -36,7 +36,7 @@ namespace :onebody do task :newuser => :environment do puts 'Create new admin user...' Site.current = site = ENV['SITE'] ? Site.find_by_name(ENV['SITE']) : Site.find(1) - unless password = ENV['PASSWORD'] + unless password = ENV['PASSWORD'] or encrypted_password = ENV['ENCRYPTED_PASSWORD'] password = ask('Password: ') { |q| q.echo = false } confirm = ask('Password (again): ') { |q| q.echo = false } raise 'Passwords do not match.' unless password == confirm @@ -44,17 +44,19 @@ namespace :onebody do unless gender = ENV['GENDER'] gender = ask('Gender ("m" or "f"): ').downcase == 'm' ? 'Male' : 'Female' end - person = site.people.create!( + attrs = { :email => ENV['EMAIL'] || ask('Email Address: '), :first_name => ENV['FIRST'] || ask('First Name: '), :last_name => ENV['LAST'] || ask('Last Name: '), - :password => password, :gender => gender, :can_sign_in => true, :visible_to_everyone => true, :visible_on_printed_directory => true, :full_access => true - ) + } + attrs[:password] = password if password + attrs[:encrypted_password] = encrypted_password if encrypted_password + person = site.people.create!(attrs) family = site.families.create!( :name => person.name, :last_name => person.last_name lib/tasks/init.rake @@ -120,7 +120,7 @@ namespace :onebody do def site_args(args={}) %w(secondary_host max_admins max_people max_groups).each do |arg| - args[arg] = (ENV[a.upcase] == '' ? nil : ENV[a.upcase]) unless ENV[a.upcase].nil? + args[arg] = (ENV[arg.upcase] == '' ? nil : ENV[arg.upcase]) unless ENV[arg.upcase].nil? end %w(import_export_enabled pages_enabled pictures_enabled publications_enabled).each do |arg| args[arg] = %w(true yes on).include?(ENV[arg.upcase].downcase) unless ENV[arg.upcase].nil? lib/tasks/multisite.rake baf41c2abb250813246e6f3e4dd4ee96035ebba5 Tim Morgan tim@timmorgan.org http://github.com/seven1m/onebody/commit/75034c80e44a35a8d47de01128e67db22c01f0c7 75034c80e44a35a8d47de01128e67db22c01f0c7 2008-08-14T22:07:55-07:00 2008-08-14T22:07:55-07:00 Add pages when creating a site. Accept encrypted_password when creating new admin user from rake task. 521a24dfa1fe44608875d83486d949936400136a Tim Morgan tim@timmorgan.org