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

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 969a368e371f60b93a6fd4c65c0b366a51ef0723..37bab38b0ccb7c6f5ff481e0efc234a01aa18d2d 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -1,17 +1,21 @@
+# == Schema Information
+#
+# Table name: user_preferences
+#
+#  user_id :bigint(8)        not null, primary key
+#  k       :string           not null, primary key
+#  v       :string           not null
+#
+# Foreign Keys
+#
+#  user_preferences_user_id_fkey  (user_id => users.id)
+#
+
 class UserPreference < ActiveRecord::Base
   self.primary_keys = "user_id", "k"
 
   belongs_to :user
 
-  validates_length_of :k, :within => 1..255
-  validates_length_of :v, :within => 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, :presence => true, :associated => true
+  validates :k, :v, :length => 1..255, :characters => true
 end