From a67ff9c0389702e169e44103d02d89886878a51d Mon Sep 17 00:00:00 2001 From: Michal Migurski Date: Tue, 6 Apr 2021 19:20:02 -0700 Subject: [PATCH] Added JSON support to user preferences --- app/controllers/api/user_preferences_controller.rb | 7 ++++++- .../api/user_preferences/_user_preference.json.jbuilder | 6 ++++++ app/views/api/user_preferences/index.json.jbuilder | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 app/views/api/user_preferences/_user_preference.json.jbuilder create mode 100644 app/views/api/user_preferences/index.json.jbuilder diff --git a/app/controllers/api/user_preferences_controller.rb b/app/controllers/api/user_preferences_controller.rb index ddc5d7f43..10b01d696 100644 --- a/app/controllers/api/user_preferences_controller.rb +++ b/app/controllers/api/user_preferences_controller.rb @@ -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 def index @user_preferences = current_user.preferences - render :formats => [:xml] + respond_to do |format| + format.xml + format.json + end end ## diff --git a/app/views/api/user_preferences/_user_preference.json.jbuilder b/app/views/api/user_preferences/_user_preference.json.jbuilder new file mode 100644 index 000000000..38bafa37f --- /dev/null +++ b/app/views/api/user_preferences/_user_preference.json.jbuilder @@ -0,0 +1,6 @@ +attrs = { + "k" => user_preference.k, + "v" => user_preference.v +} + +json.preference(attrs) diff --git a/app/views/api/user_preferences/index.json.jbuilder b/app/views/api/user_preferences/index.json.jbuilder new file mode 100644 index 000000000..b3255562f --- /dev/null +++ b/app/views/api/user_preferences/index.json.jbuilder @@ -0,0 +1 @@ +json.partial! @user_preferences -- 2.43.2