Merge branch 'pull/3472'

[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 83e28bc4e0047ef4e3a9a880a08406813f654693..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
 module Api
   class UserPreferencesController < ApiController
     before_action :authorize


@@ -7,12 +7,17 @@ module Api
 
     around_action :api_call_handle_error
 
 
     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
       @user_preferences = current_user.preferences
 
     def index
       @user_preferences = current_user.preferences
 

-      render :formats => [:xml]
+      respond_to do |format|
+        format.xml
+        format.json
+      end

     end
 
     ##
     end
 
     ##


@@ -25,9 +30,7 @@ module Api
 
     # update the entire set of preferences
     def update_all
 
     # 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 = {}
 
 
       new_preferences = {}