Merge branch 'master' into notes

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 28ef40f1d5c8347597c9f9a790b4d8d002cb63ce..f10d0a3f98ec49c9e88da027aa0f22a53debe9a5 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -1,10 +1,13 @@
 class UserPreference < ActiveRecord::Base
-  set_primary_keys :user_id, :k
+  self.primary_keys = "user_id", "k"
+
   belongs_to :user
   
   validates_length_of :k, :within => 1..255
   validates_length_of :v, :within => 1..255
 
+  attr_accessible :k, :v
+
   # Turn this Node in to an XML Node without the <osm> wrapper.
   def to_xml_node
     el1 = XML::Node.new 'preference'