Merge remote-tracking branch 'upstream/pull/4962'

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index f10d0a3f98ec49c9e88da027aa0f22a53debe9a5..5b91bbda91badfe4f4242c9fc6a5a563b4cdcd19 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -1,20 +1,19 @@
-class UserPreference < ActiveRecord::Base
-  self.primary_keys = "user_id", "k"
+# == Schema Information
+#
+# Table name: user_preferences
+#
+#  user_id :bigint(8)        not null, primary key
+#  k       :string           not null, primary key
+#  v       :string           not null
+#
+# Foreign Keys
+#
+#  user_preferences_user_id_fkey  (user_id => users.id)
+#

 
 

+class UserPreference < ApplicationRecord

   belongs_to :user
   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'
-    el1['k'] = self.k
-    el1['v'] = self.v
-    
-    return el1
-  end

 
 

+  validates :user, :associated => true
+  validates :k, :v, :length => 1..255, :characters => true

 end
 end