Treeat user as logged in after a password reset

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 969a368e371f60b93a6fd4c65c0b366a51ef0723..7c65a589953a688e3d4aa87e533ac00e9c8839ce 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -3,14 +3,14 @@ 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'] = k
-    el1['v'] = v
+    el1 = XML::Node.new "preference"
+    el1["k"] = k
+    el1["v"] = v

 
     el1
   end
 
     el1
   end