Rename Friend model to Friendship

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 639bbc07af6b7e27bafeb595b8682956cdc021ed..583ced3c56d19ed15de8dd2a4ff6922b37312de8 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -2,7 +2,7 @@
 #
 # Table name: user_preferences
 #
 #
 # Table name: user_preferences
 #

-#  user_id :integer          not null, primary key
+#  user_id :bigint(8)        not null, primary key

 #  k       :string           not null, primary key
 #  v       :string           not null
 #
 #  k       :string           not null, primary key
 #  v       :string           not null
 #


@@ -17,7 +17,7 @@ class UserPreference < ActiveRecord::Base
   belongs_to :user
 
   validates :user, :presence => true, :associated => true
   belongs_to :user
 
   validates :user, :presence => true, :associated => true

-  validates :k, :v, :length => 1..255, :invalid_chars => true
+  validates :k, :v, :length => 1..255, :characters => true

 
   # 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