From fd5e84bd62310972f8416ea1c2649a9c2f44c8cd Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Wed, 3 Dec 2014 11:19:32 +0200 Subject: [PATCH] Settings now honor empty database --- config/initializers/initial_settings.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/config/initializers/initial_settings.rb b/config/initializers/initial_settings.rb index 05f2a9863..7a00d673c 100644 --- a/config/initializers/initial_settings.rb +++ b/config/initializers/initial_settings.rb @@ -1,7 +1,9 @@ -Setting.disclosure_name = true if Setting.disclosure_name.nil? -Setting.disclosure_name = true if Setting.disclosure_name.nil? -Setting.disclosure_org_name = true if Setting.disclosure_org_name.nil? -Setting.disclosure_email = true if Setting.disclosure_email.nil? -Setting.disclosure_phone = false if Setting.disclosure_phone.nil? -Setting.disclosure_fax = false if Setting.disclosure_fax.nil? -Setting.disclosure_address = false if Setting.disclosure_address.nil? +if ActiveRecord::Base.connection.table_exists? 'settings' # otherwise rake not working 100% + Setting.disclosure_name = true if Setting.disclosure_name.nil? + Setting.disclosure_name = true if Setting.disclosure_name.nil? + Setting.disclosure_org_name = true if Setting.disclosure_org_name.nil? + Setting.disclosure_email = true if Setting.disclosure_email.nil? + Setting.disclosure_phone = false if Setting.disclosure_phone.nil? + Setting.disclosure_fax = false if Setting.disclosure_fax.nil? + Setting.disclosure_address = false if Setting.disclosure_address.nil? +end