Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

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

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

+  set_primary_keys :user_id, :k

   belongs_to :user
   belongs_to :user

+
+  # 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
+

 end
 end