Merge branch 'master' into openstreetbugs

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index a354fb0ef041259ce875c03724fb11b6c1ff99c4..b9cca0cf6798cb39f6dd828a5d104443b81be655 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -24,7 +24,7 @@ class UserController < ApplicationController
 
     if request.xhr?
       render :update do |page|
-        page.replace_html "contributorTerms", :partial => "terms"
+        page.replace_html "contributorTerms", :partial => "terms", :locals => { :has_decline => params[:has_decline] }
       end
     else
       @title = t 'user.terms.title'
@@ -220,6 +220,8 @@ class UserController < ApplicationController
       else
         flash.now[:error] = t 'user.login.auth failure'
       end
+    else
+      flash.now[:notice] =  t 'user.login.notice'
     end
   end