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

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 3963bd02aeb47ade7f6b47faf15293412b63c604..741aa335aca9c2f2375cb09bbe0093912e07115e 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -2,7 +2,7 @@
 #
 # Table name: user_preferences
 #
 #
 # Table name: user_preferences
 #

-#  user_id :integer          not null, primary key
+#  user_id :bigint(8)        not null, primary key

 #  k       :string           not null, primary key
 #  v       :string           not null
 #
 #  k       :string           not null, primary key
 #  v       :string           not null
 #


@@ -11,20 +11,11 @@
 #  user_preferences_user_id_fkey  (user_id => users.id)
 #
 
 #  user_preferences_user_id_fkey  (user_id => users.id)
 #
 

-class UserPreference < ActiveRecord::Base
+class UserPreference < ApplicationRecord

   self.primary_keys = "user_id", "k"
 
   belongs_to :user
 
   self.primary_keys = "user_id", "k"
 
   belongs_to :user
 

-  validates :user, :presence => true, :associated => true
+  validates :user, :associated => true

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

-
-  # Turn this Node in to an XML Node without the <osm> wrapper.
-  def to_xml_node
-    el1 = XML::Node.new "preference"
-    el1["k"] = k
-    el1["v"] = v
-
-    el1
-  end

 end
 end