X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bf29550db840c97cafffbe1e836750bef6c7942d..ed84930283982062753e8fbd7323239d70dd1611:/app/models/user_preference.rb

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 28ef40f1d..7c65a5899 100644
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -1,17 +1,17 @@
 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
 
   # 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