]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 52dd258)
We don't need the @notice hack - we can use flash.now to achieve the same thing.
authorTom Hughes <tom@compton.nu>
Sun, 1 Nov 2009 12:32:31 +0000 (12:32 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 1 Nov 2009 12:32:31 +0000 (12:32 +0000)
app/controllers/application_controller.rb patch | blob | history
app/controllers/user_controller.rb patch | blob | history
app/views/layouts/site.html.erb patch | blob | history

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e36c9842ba6c55eea2e652d453b60d16732bc86e..ed007cad34c1ee1b0674fb67dafab322adb09419 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -47,7 +47,7 @@ class ApplicationController < ActionController::Base
         redirect_to params.merge(:cookie_test => "true")
         return false
       else
-        @notice = t 'application.require_cookies.cookies_needed'
+        flash.now[:notice] = t 'application.require_cookies.cookies_needed'
       end
     end
   end
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index df6ca164c4a43c50925587b16db68d6ecfee7ef5..3a65cea0afdabe30250178752c655a62d70e4718 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -101,9 +101,9 @@ class UserController < ApplicationController
       if user
         token = user.tokens.create
         Notifier.deliver_lost_password(user, token)
-        @notice = t 'user.lost_password.notice email on way'
+        flash.now[:notice] = t 'user.lost_password.notice email on way'
       else
-        @notice = t 'user.lost_password.notice email cannot find'
+        flash.now[:notice] = t 'user.lost_password.notice email cannot find'
       end
     end
   end
@@ -152,9 +152,9 @@ class UserController < ApplicationController
       if user
         session[:user] = user.id
       elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
-        @notice = t 'user.login.account not active'
+        flash.now[:notice] = t 'user.login.account not active'
       else
-        @notice = t 'user.login.auth failure'
+        flash.now[:notice] = t 'user.login.auth failure'
       end
     end
 
@@ -211,7 +211,7 @@ class UserController < ApplicationController
           redirect_to :action => 'account', :display_name => @user.display_name
         end
       else
-        @notice = t 'user.confirm.failure'
+        flash.now[:notice] = t 'user.confirm.failure'
       end
     end
   end
@@ -231,7 +231,7 @@ class UserController < ApplicationController
         session[:user] = @user.id
         redirect_to :action => 'account', :display_name => @user.display_name
       else
-        @notice = t 'user.confirm_email.failure'
+        flash.now[:notice] = t 'user.confirm_email.failure'
       end
     end
   end
diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 89b33ab05db12288d3ff0344821ee75ccb1d1843..34738f73b9805897d80e29d0c7f45d12ec5ea007 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -18,8 +18,8 @@
   </head>
   <body>
     <div id="content">
-      <% if @notice || flash[:notice] %>
-        <div id="notice"><%= @notice || flash[:notice] %></div>
+      <% if flash[:notice] %>
+        <div id="notice"><%= flash[:notice] %></div>
       <% end %>
 
       <%= yield %>
The OpenStreetMap web site