Merge remote-tracking branch 'upstream/pull/4673'

[rails.git] / app / models / user_preference.rb

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 69b0e9ddec9fc020787c76165f3323ec9cceccd7..5b91bbda91badfe4f4242c9fc6a5a563b4cdcd19 100644 (file)
--- 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,9 @@
 #  user_preferences_user_id_fkey  (user_id => users.id)
 #
 
-class UserPreference < ActiveRecord::Base
-  self.primary_keys = "user_id", "k"
-
+class UserPreference < ApplicationRecord
   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 <osm> 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