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

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 28ef40f1d5c8347597c9f9a790b4d8d002cb63ce..583ced3c56d19ed15de8dd2a4ff6922b37312de8 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -1,17 +1,30 @@
+# == 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
-  set_primary_keys :user_id, :k
+  self.primary_keys = "user_id", "k"
+
   belongs_to :user
-  
-  validates_length_of :k, :within => 1..255
-  validates_length_of :v, :within => 1..255
+
+  validates :user, :presence => true, :associated => true
+  validates :k, :v, :length => 1..255, :characters => true
 
   # Turn this Node in to an XML Node without the <osm> wrapper.
   def to_xml_node
-    el1 = XML::Node.new 'preference'
-    el1['k'] = self.k
-    el1['v'] = self.v
-    
-    return el1
-  end
+    el1 = XML::Node.new "preference"
+    el1["k"] = k
+    el1["v"] = v
 
+    el1
+  end
 end