X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/effb1b7f4170bb7244c4dfffcbe6134fe00e2bc4..191d7f371031cec6a1b83157d3e9f17dee787075:/app/models/user_preference.rb diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb index 69b0e9dde..d5cad3978 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 - - # 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 :k, :v, :length => 1..255, :characters => true end