Refactor the profile page to move the profile information out of the header

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 727d8ee3faed139adce3edc3b0922bb81b94be0e..42ac6ac11a15e05145d926611215bdaef3437dc4 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -28,7 +28,7 @@ class UsersController < ApplicationController
 
       if current_user&.terms_agreed?
         # Already agreed to terms, so just show settings
 
       if current_user&.terms_agreed?
         # Already agreed to terms, so just show settings

-        redirect_to :action => :account, :display_name => current_user.display_name
+        redirect_to user_account_path(current_user)

       elsif current_user.nil? && session[:new_user].nil?
         redirect_to login_path(:referer => request.fullpath)
       end
       elsif current_user.nil? && session[:new_user].nil?
         redirect_to login_path(:referer => request.fullpath)
       end


@@ -47,7 +47,7 @@ class UsersController < ApplicationController
         if params[:referer]
           redirect_to safe_referer(params[:referer])
         else
         if params[:referer]
           redirect_to safe_referer(params[:referer])
         else

-          redirect_to :action => :account, :display_name => current_user.display_name
+          redirect_to user_account_path(current_user)

         end
       elsif params[:decline]
         redirect_to t("users.terms.declined")
         end
       elsif params[:decline]
         redirect_to t("users.terms.declined")


@@ -67,7 +67,7 @@ class UsersController < ApplicationController
       if params[:referer]
         redirect_to safe_referer(params[:referer])
       else
       if params[:referer]
         redirect_to safe_referer(params[:referer])
       else

-        redirect_to :action => :account, :display_name => current_user.display_name
+        redirect_to user_account_path(current_user)

       end
     else
       self.current_user = session.delete(:new_user)
       end
     else
       self.current_user = session.delete(:new_user)


@@ -147,7 +147,7 @@ class UsersController < ApplicationController
     current_user.data_public = true
     current_user.save
     flash[:notice] = t "users.go_public.flash success"
     current_user.data_public = true
     current_user.save
     flash[:notice] = t "users.go_public.flash success"

-    redirect_to :action => "account", :display_name => current_user.display_name
+    redirect_to user_account_path(current_user)

   end
 
   def new
   end
 
   def new


@@ -277,15 +277,15 @@ class UsersController < ApplicationController
     name = auth_info[:info][:name]
     email = auth_info[:info][:email]
 
     name = auth_info[:info][:name]
     email = auth_info[:info][:email]
 

-    case provider
-    when "openid"
-      email_verified = uid.match(%r{https://www.google.com/accounts/o8/id?(.*)}) ||
+    email_verified = case provider
+                     when "openid"
+                       uid.match(%r{https://www.google.com/accounts/o8/id?(.*)}) ||

                        uid.match(%r{https://me.yahoo.com/(.*)})
                        uid.match(%r{https://me.yahoo.com/(.*)})

-    when "google", "facebook"
-      email_verified = true
-    else
-      email_verified = false
-    end
+                     when "google", "facebook"
+                       true
+                     else
+                       false
+                     end

 
     if settings = session.delete(:new_user_settings)
       current_user.auth_provider = provider
 
     if settings = session.delete(:new_user_settings)
       current_user.auth_provider = provider


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

-      redirect_to :action => "account", :display_name => current_user.display_name
+      redirect_to user_account_path(current_user)

     elsif session[:new_user]
       session[:new_user].auth_provider = provider
       session[:new_user].auth_uid = uid
     elsif session[:new_user]
       session[:new_user].auth_provider = provider
       session[:new_user].auth_uid = uid