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

[rails.git] / app / controllers / preferences_controller.rb

diff --git a/app/controllers/preferences_controller.rb b/app/controllers/preferences_controller.rb
index f002d5d395d045307735fbf874dee70eefa71c1a..910f6a24fc44350e490b771d34fb417dd5cedfa0 100644 (file)
--- a/app/controllers/preferences_controller.rb
+++ b/app/controllers/preferences_controller.rb
@@ -11,8 +11,6 @@ class PreferencesController < ApplicationController
 
   def show; end
 
 
   def show; end
 

-  def edit; end
-

   def update
     current_user.languages = params[:user][:languages].split(",")
 
   def update
     current_user.languages = params[:user][:languages].split(",")
 


@@ -29,13 +27,18 @@ class PreferencesController < ApplicationController
       success &= site_color_scheme_preference.update(:v => params[:site_color_scheme])
     end
 
       success &= site_color_scheme_preference.update(:v => params[:site_color_scheme])
     end
 

+    if params[:map_color_scheme]
+      map_color_scheme_preference = current_user.preferences.find_or_create_by(:k => "map.color_scheme")
+      success &= map_color_scheme_preference.update(:v => params[:map_color_scheme])
+    end
+

     if success
       # Use a partial so that it is rendered during the next page load in the correct language.
       flash[:notice] = { :partial => "preferences/update_success_flash" }
       redirect_to preferences_path
     else
       flash.now[:error] = t ".failure"
     if success
       # Use a partial so that it is rendered during the next page load in the correct language.
       flash[:notice] = { :partial => "preferences/update_success_flash" }
       redirect_to preferences_path
     else
       flash.now[:error] = t ".failure"

-      render :edit
+      render :show

     end
   end
 end
     end
   end
 end