Fix remaining JSHint issues

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 28ef40f1d5c8347597c9f9a790b4d8d002cb63ce..0533ccad2d83857a967feefdb2703b1e19c145ac 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -1,17 +1,17 @@
 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
   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

-    el1 = XML::Node.new 'preference'
-    el1['k'] = self.k
-    el1['v'] = self.v
-    
-    return el1
-  end
+    el1 = XML::Node.new "preference"
+    el1["k"] = k
+    el1["v"] = v

 
 

+    el1
+  end

 end
 end