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

[rails.git] / app / controllers / api / user_preferences_controller.rb

diff --git a/app/controllers/api/user_preferences_controller.rb b/app/controllers/api/user_preferences_controller.rb
index 9b117a4d92c2583d17894c20d5ac9c2bfb4a23db..02a23095addd70ef9a72dde3d84cad35a257b308 100644 (file)
--- a/app/controllers/api/user_preferences_controller.rb
+++ b/app/controllers/api/user_preferences_controller.rb
@@ -1,4 +1,4 @@
-# Update and read user preferences, which are arbitrayr key/val pairs
+# Update and read user preferences, which are arbitrary key/val pairs
 module Api
   class UserPreferencesController < ApiController
     before_action :authorize
@@ -7,21 +7,17 @@ module Api
 
     around_action :api_call_handle_error
 
+    before_action :set_request_formats
+
     ##
-    # return all the preferences as an XML document
+    # return all the preferences
     def index
-      doc = OSM::API.new.get_xml_doc
-
-      prefs = current_user.preferences
-
-      el1 = XML::Node.new "preferences"
+      @user_preferences = current_user.preferences
 
-      prefs.each do |pref|
-        el1 << pref.to_xml_node
+      respond_to do |format|
+        format.xml
+        format.json
       end
-
-      doc.root << el1
-      render :xml => doc.to_s
     end
 
     ##
@@ -34,9 +30,7 @@ module Api
 
     # update the entire set of preferences
     def update_all
-      old_preferences = current_user.preferences.each_with_object({}) do |preference, preferences|
-        preferences[preference.k] = preference
-      end
+      old_preferences = current_user.preferences.index_by(&:k)
 
       new_preferences = {}