L.hash expects parseHash to return false if there isn't a location

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 3985a527ec5f62e83b53b948b72164a48789a08d..b5110bbf5592fd37b599e8f599ea27c2e77580e7 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -1,6 +1,10 @@
 class UserPreference < ActiveRecord::Base
 class UserPreference < ActiveRecord::Base

-  set_primary_keys :user_id, :k
+  self.primary_keys = "user_id", "k"
+

   belongs_to :user
   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
 
   # Turn this Node in to an XML Node without the <osm> wrapper.
   def to_xml_node