X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ff7ddb6b86bf918a9418af7382836b41594d45e4..32104684f7fe70bac494ede1f7249a6cf19a63ec:/app/controllers/api/user_preferences_controller.rb?ds=inline diff --git a/app/controllers/api/user_preferences_controller.rb b/app/controllers/api/user_preferences_controller.rb index 83e28bc4e..02a23095a 100644 --- 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,12 +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 @user_preferences = current_user.preferences - render :formats => [:xml] + respond_to do |format| + format.xml + format.json + end end ## @@ -25,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 = {}