Merge remote-tracking branch 'openstreetmap/pull/954'

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index f10d0a3f98ec49c9e88da027aa0f22a53debe9a5..7c65a589953a688e3d4aa87e533ac00e9c8839ce 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -2,19 +2,16 @@ 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
 
-  attr_accessible :k, :v
+  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