Merge branch 'master' into openstreetbugs

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 2a73f22331d7333f7a262c6d262dad0519a25824..28ef40f1d5c8347597c9f9a790b4d8d002cb63ce 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -1,5 +1,9 @@
 class UserPreference < ActiveRecord::Base
+  set_primary_keys :user_id, :k
   belongs_to :user
+  
+  validates_length_of :k, :within => 1..255
+  validates_length_of :v, :within => 1..255
 
   # Turn this Node in to an XML Node without the <osm> wrapper.
   def to_xml_node