Merge branch 'pull/843' into titles

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index b5110bbf5592fd37b599e8f599ea27c2e77580e7..69b0e9ddec9fc020787c76165f3323ec9cceccd7 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -1,18 +1,30 @@
+# == Schema Information
+#
+# Table name: user_preferences
+#
+#  user_id :integer          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
   self.primary_keys = "user_id", "k"
 
   belongs_to :user
 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
+
+  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
-    
-    return el1
-  end
+    el1 = XML::Node.new "preference"
+    el1["k"] = k
+    el1["v"] = v

 
 

+    el1
+  end

 end
 end