X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6edb8dae058979f9c5cb198ad4f7af3f700ba84b..4133936c6304b7d1a57c85d53fb7c3a906190164:/app/controllers/application_controller.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a7235241c..25de71f20 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -39,7 +39,7 @@ class ApplicationController < ActionController::Base private - def authorize_web + def authorize_web(skip_terms: false) if session[:user] self.current_user = User.find_by(:id => session[:user], :status => %w[active confirmed suspended]) @@ -55,7 +55,7 @@ class ApplicationController < ActionController::Base # don't allow access to any auth-requiring part of the site unless # the new CTs have been seen (and accept/decline chosen). - elsif !current_user.terms_seen && flash[:skip_terms].nil? + elsif !current_user.terms_seen && !skip_terms flash[:notice] = t "accounts.terms.show.you need to accept or decline" if params[:referer] redirect_to account_terms_path(:referer => params[:referer])