Commit 4c305d4d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Validate application settings only if column exists

parent b9d09a0c
class ApplicationSetting < ActiveRecord::Base class ApplicationSetting < ActiveRecord::Base
validates :home_page_url, allow_blank: true, validates :home_page_url, allow_blank: true,
format: { with: URI::regexp(%w(http https)), message: "should be a valid url" } format: { with: URI::regexp(%w(http https)), message: "should be a valid url" },
if: :home_page_url_column_exist
def self.current def self.current
ApplicationSetting.last ApplicationSetting.last
...@@ -15,4 +16,8 @@ class ApplicationSetting < ActiveRecord::Base ...@@ -15,4 +16,8 @@ class ApplicationSetting < ActiveRecord::Base
sign_in_text: Settings.extra['sign_in_text'], sign_in_text: Settings.extra['sign_in_text'],
) )
end end
def home_page_url_column_exist
ActiveRecord::Base.connection.column_exists?(:application_settings, :home_page_url)
end
end end
...@@ -424,7 +424,6 @@ ActiveRecord::Schema.define(version: 20150116234544) do ...@@ -424,7 +424,6 @@ ActiveRecord::Schema.define(version: 20150116234544) do
t.integer "notification_level", default: 1, null: false t.integer "notification_level", default: 1, null: false
t.datetime "password_expires_at" t.datetime "password_expires_at"
t.integer "created_by_id" t.integer "created_by_id"
t.datetime "last_credential_check_at"
t.string "avatar" t.string "avatar"
t.string "confirmation_token" t.string "confirmation_token"
t.datetime "confirmed_at" t.datetime "confirmed_at"
...@@ -432,6 +431,7 @@ ActiveRecord::Schema.define(version: 20150116234544) do ...@@ -432,6 +431,7 @@ ActiveRecord::Schema.define(version: 20150116234544) do
t.string "unconfirmed_email" t.string "unconfirmed_email"
t.boolean "hide_no_ssh_key", default: false t.boolean "hide_no_ssh_key", default: false
t.string "website_url", default: "", null: false t.string "website_url", default: "", null: false
t.datetime "last_credential_check_at"
t.string "github_access_token" t.string "github_access_token"
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment