Cleanup trailing whitespace

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 28ef40f1d5c8347597c9f9a790b4d8d002cb63ce..7faec977e6724bd7868e9bce03f22ad90ed5809e 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -1,7 +1,8 @@
 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
 
   validates_length_of :k, :within => 1..255
   validates_length_of :v, :within => 1..255
 


@@ -10,7 +11,7 @@ class UserPreference < ActiveRecord::Base
     el1 = XML::Node.new 'preference'
     el1['k'] = self.k
     el1['v'] = self.v
     el1 = XML::Node.new 'preference'
     el1['k'] = self.k
     el1['v'] = self.v

-    
+

     return el1
   end
 
     return el1
   end