Only display the license notice if we don't already have a notice
authorTom Hughes <tom@compton.nu>
Fri, 10 Sep 2010 10:23:01 +0000 (11:23 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 10 Sep 2010 10:23:01 +0000 (11:23 +0100)
app/controllers/user_controller.rb

index b9cca0cf6798cb39f6dd828a5d104443b81be655..21561736c53b6c78d57a5257d58a5b8c602be0ba 100644 (file)
@@ -220,7 +220,7 @@ class UserController < ApplicationController
       else
         flash.now[:error] = t 'user.login.auth failure'
       end
-    else
+    elsif flash[:notice].nil?
       flash.now[:notice] =  t 'user.login.notice'
     end
   end