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

[rails.git] / app / controllers / user_preference_controller.rb

diff --git a/app/controllers/user_preference_controller.rb b/app/controllers/user_preference_controller.rb
index bf9bab213296f1ad4bc3324b480ad89f9a4895cd..16165513aefa217b11b1ac80520a89882de5d465 100644 (file)
--- a/app/controllers/user_preference_controller.rb
+++ b/app/controllers/user_preference_controller.rb
@@ -11,7 +11,7 @@ class UserPreferenceController < ApplicationController
   def read
     doc = OSM::API.new.get_xml_doc
 
   def read
     doc = OSM::API.new.get_xml_doc
 

-    prefs = @user.preferences
+    prefs = current_user.preferences

 
     el1 = XML::Node.new "preferences"
 
 
     el1 = XML::Node.new "preferences"
 


@@ -20,20 +20,20 @@ class UserPreferenceController < ApplicationController
     end
 
     doc.root << el1
     end
 
     doc.root << el1

-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s

   end
 
   ##
   # return the value for a single preference
   def read_one
   end
 
   ##
   # return the value for a single preference
   def read_one

-    pref = UserPreference.find([@user.id, params[:preference_key]])
+    pref = UserPreference.find([current_user.id, params[:preference_key]])

 
 

-    render :text => pref.v.to_s, :content_type => "text/plain"
+    render :plain => pref.v.to_s

   end
 
   # update the entire set of preferences
   def update
   end
 
   # update the entire set of preferences
   def update

-    old_preferences = @user.preferences.each_with_object({}) do |preference, preferences|
+    old_preferences = current_user.preferences.each_with_object({}) do |preference, preferences|

       preferences[preference.k] = preference
     end
 
       preferences[preference.k] = preference
     end
 


@@ -45,9 +45,9 @@ class UserPreferenceController < ApplicationController
       if preference = old_preferences.delete(pt["k"])
         preference.v = pt["v"]
       elsif new_preferences.include?(pt["k"])
       if preference = old_preferences.delete(pt["k"])
         preference.v = pt["v"]
       elsif new_preferences.include?(pt["k"])

-        raise OSM::APIDuplicatePreferenceError.new(pt["k"])
+        raise OSM::APIDuplicatePreferenceError, pt["k"]

       else
       else

-        preference = @user.preferences.build(:k => pt["k"], :v => pt["v"])
+        preference = current_user.preferences.build(:k => pt["k"], :v => pt["v"])

       end
 
       new_preferences[preference.k] = preference
       end
 
       new_preferences[preference.k] = preference


@@ -57,31 +57,31 @@ class UserPreferenceController < ApplicationController
 
     new_preferences.each_value(&:save!)
 
 
     new_preferences.each_value(&:save!)
 

-    render :text => "", :content_type => "text/plain"
+    render :plain => ""

   end
 
   ##
   # update the value of a single preference
   def update_one
     begin
   end
 
   ##
   # update the value of a single preference
   def update_one
     begin

-      pref = UserPreference.find([@user.id, params[:preference_key]])
+      pref = UserPreference.find([current_user.id, params[:preference_key]])

     rescue ActiveRecord::RecordNotFound
       pref = UserPreference.new
     rescue ActiveRecord::RecordNotFound
       pref = UserPreference.new

-      pref.user = @user
+      pref.user = current_user

       pref.k = params[:preference_key]
     end
 
     pref.v = request.raw_post.chomp
     pref.save!
 
       pref.k = params[:preference_key]
     end
 
     pref.v = request.raw_post.chomp
     pref.save!
 

-    render :text => "", :content_type => "text/plain"
+    render :plain => ""

   end
 
   ##
   # delete a single preference
   def delete_one
   end
 
   ##
   # delete a single preference
   def delete_one

-    UserPreference.find([@user.id, params[:preference_key]]).delete
+    UserPreference.find([current_user.id, params[:preference_key]]).delete

 
 

-    render :text => "", :content_type => "text/plain"
+    render :plain => ""

   end
 end
   end
 end