X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1e57189366c0e4a49cb29658e9bf5985996709a2..8d7b98a618cd381a0aa1de578b4af9421634c308:/app/models/user_preference.rb?ds=inline diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb index 639bbc07a..741aa335a 100644 --- a/app/models/user_preference.rb +++ b/app/models/user_preference.rb @@ -2,7 +2,7 @@ # # Table name: user_preferences # -# user_id :integer not null, primary key +# user_id :bigint(8) not null, primary key # k :string not null, primary key # v :string not null # @@ -11,20 +11,11 @@ # user_preferences_user_id_fkey (user_id => users.id) # -class UserPreference < ActiveRecord::Base +class UserPreference < ApplicationRecord self.primary_keys = "user_id", "k" belongs_to :user - validates :user, :presence => true, :associated => true - validates :k, :v, :length => 1..255, :invalid_chars => true - - # Turn this Node in to an XML Node without the wrapper. - def to_xml_node - el1 = XML::Node.new "preference" - el1["k"] = k - el1["v"] = v - - el1 - end + validates :user, :associated => true + validates :k, :v, :length => 1..255, :characters => true end