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

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a0be87bdc11fa6417601b6e278030fc673825515..7f6619eab664f4b08dd9836fbee1b165b73dc125 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -101,7 +101,7 @@ class UsersController < ApplicationController
     current_user.data_public = true
     current_user.save
     flash[:notice] = t ".flash success"
     current_user.data_public = true
     current_user.save
     flash[:notice] = t ".flash success"

-    redirect_to edit_account_path
+    redirect_to account_path

   end
 
   ##
   end
 
   ##


@@ -135,7 +135,7 @@ class UsersController < ApplicationController
 
       session[:user_errors] = current_user.errors.as_json
 
 
       session[:user_errors] = current_user.errors.as_json
 

-      redirect_to edit_account_path
+      redirect_to account_path

     else
       user = User.find_by(:auth_provider => provider, :auth_uid => uid)
 
     else
       user = User.find_by(:auth_provider => provider, :auth_uid => uid)
 


@@ -222,8 +222,7 @@ class UsersController < ApplicationController
   def user_params
     params.require(:user).permit(:email, :display_name,
                                  :auth_provider, :auth_uid,
   def user_params
     params.require(:user).permit(:email, :display_name,
                                  :auth_provider, :auth_uid,

-                                 :pass_crypt, :pass_crypt_confirmation,
-                                 :consider_pd)
+                                 :pass_crypt, :pass_crypt_confirmation)

   end
 
   ##
   end
 
   ##