Don't user flash[:notice] when we're not redirecting as it will

persist to the next request and cause confusion.

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 26c56132cafc97446b6e94ab0237561f524eb7d9..2bb4eb5772ff329d047ead6a0005a9730a4a625c 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -45,13 +45,11 @@ class UserController < ApplicationController
 
       if @user.save
         if params[:user][:email] == @user.new_email
 
       if @user.save
         if params[:user][:email] == @user.new_email

-          flash[:notice] = "User information updated successfully. Check your email for a note to confirm your new email address."
+          @notice = "User information updated successfully. Check your email for a note to confirm your new email address."

           Notifier.deliver_email_confirm(@user, @user.tokens.create)
         else
           Notifier.deliver_email_confirm(@user, @user.tokens.create)
         else

-          flash[:notice] = "User information updated successfully."
+          @notice = "User information updated successfully."

         end
         end

-      else
-        flash.delete(:notice)

       end
     end
   end
       end
     end
   end


@@ -81,12 +79,10 @@ class UserController < ApplicationController
       if user
         token = user.tokens.create
         Notifier.deliver_lost_password(user, token)
       if user
         token = user.tokens.create
         Notifier.deliver_lost_password(user, token)

-        flash[:notice] = "Sorry you lost it :-( but an email is on its way so you can reset it soon."
+        @notice = "Sorry you lost it :-( but an email is on its way so you can reset it soon."

       else
       else

-        flash[:notice] = "Couldn't find that email address, sorry."
+        @notice = "Couldn't find that email address, sorry."

       end
       end

-    else
-      render :action => 'lost_password'

     end
   end
 
     end
   end
 


@@ -109,6 +105,7 @@ class UserController < ApplicationController
         flash[:notice] = "Didn't find that token, check the URL maybe?"
       end
     end
         flash[:notice] = "Didn't find that token, check the URL maybe?"
       end
     end

+

     redirect_to :action => 'login'
   end
 
     redirect_to :action => 'login'
   end
 


@@ -131,9 +128,9 @@ class UserController < ApplicationController
         end
         return
       elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
         end
         return
       elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)

-        flash[:notice] = "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
+        @notice = "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."

       else
       else

-        flash[:notice] = "Sorry, couldn't log in with those details."
+        @notice = "Sorry, couldn't log in with those details."

       end
     end
   end
       end
     end
   end


@@ -167,7 +164,7 @@ class UserController < ApplicationController
         session[:user] = @user.id
         redirect_to :action => 'account', :display_name => @user.display_name
       else
         session[:user] = @user.id
         redirect_to :action => 'account', :display_name => @user.display_name
       else

-        flash[:notice] = 'Something went wrong confirming that user.'
+        @notice = 'Something went wrong confirming that user.'

       end
     end
   end
       end
     end
   end


@@ -187,7 +184,7 @@ class UserController < ApplicationController
         session[:user] = @user.id
         redirect_to :action => 'account', :display_name => @user.display_name
       else
         session[:user] = @user.id
         redirect_to :action => 'account', :display_name => @user.display_name
       else

-        flash[:notice] = 'Something went wrong confirming that email address.'
+        @notice = 'Something went wrong confirming that email address.'

       end
     end
   end
       end
     end
   end


@@ -244,6 +241,7 @@ class UserController < ApplicationController
       else
         flash[:notice] = "You are already friends with #{name}."  
       end
       else
         flash[:notice] = "You are already friends with #{name}."  
       end

+

       redirect_to :controller => 'user', :action => 'view'
     end
   end
       redirect_to :controller => 'user', :action => 'view'
     end
   end


@@ -258,9 +256,8 @@ class UserController < ApplicationController
       else
         flash[:notice] = "#{friend.display_name} was not already one of your friends."
       end
       else
         flash[:notice] = "#{friend.display_name} was not already one of your friends."
       end

+

       redirect_to :controller => 'user', :action => 'view'
     end
   end
       redirect_to :controller => 'user', :action => 'view'
     end
   end

-

 end
 end

-

diff --git a/app/views/layouts/site.rhtml b/app/views/layouts/site.rhtml
index 4b41e5e9e84106cc438a180cd7a9e87ae2869d37..7aa2db7b9432cdb5d44a90e7e38d6fa9e0866e33 100644 (file)
--- a/app/views/layouts/site.rhtml
+++ b/app/views/layouts/site.rhtml
@@ -11,8 +11,8 @@
   </head>
   <body>
     <div id="content">
   </head>
   <body>
     <div id="content">

-      <% if flash[:notice] %>
-        <div id="notice"><%= flash[:notice] %></div>
+      <% if @notice || flash[:notice] %>
+        <div id="notice"><%= @notice || flash[:notice] %></div>

       <% end %>
 
       <%= yield %>
       <% end %>
 
       <%= yield %>