Add entries for cowshed and sty to en.yml

[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 10b01d69688ebdebeff0c4b4d2cff6dbd42c6543..cb852ce881aa10909a267e776aa884c406e388b4 100644 (file)
--- a/app/controllers/api/user_preferences_controller.rb
+++ b/app/controllers/api/user_preferences_controller.rb
@@ -1,6 +1,7 @@
-# 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
 module Api
   class UserPreferencesController < ApiController

+    before_action :check_api_writable, :only => [:update_all, :update, :destroy]

     before_action :authorize
 
     authorize_resource
     before_action :authorize
 
     authorize_resource


@@ -10,7 +11,7 @@ module Api
     before_action :set_request_formats
 
     ##
     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
 


@@ -66,7 +67,7 @@ module Api
         pref.k = params[:preference_key]
       end
 
         pref.k = params[:preference_key]
       end
 

-      pref.v = request.raw_post.chomp
+      pref.v = request.raw_post.chomp.force_encoding("UTF-8")

       pref.save!
 
       render :plain => ""
       pref.save!
 
       render :plain => ""