Logo was being attached twice on changeset comment notifications

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 7faec977e6724bd7868e9bce03f22ad90ed5809e..7c65a589953a688e3d4aa87e533ac00e9c8839ce 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -3,16 +3,15 @@ class UserPreference < ActiveRecord::Base
 
   belongs_to :user
 
 
   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
 
   # 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
+    el1 = XML::Node.new "preference"
+    el1["k"] = k
+    el1["v"] = v

 
 

-    return el1
+    el1

   end
   end

-

 end
 end