From 7224f22d97091989d7ef2365466a67bc98aabfa0 Mon Sep 17 00:00:00 2001 From: Courteney Ervin Date: Mon, 9 Mar 2015 23:45:22 -0400 Subject: [PATCH] Switch from errors to alerts so oauth-related flashes will show --- app/controllers/services_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb index c1049c97..a939616a 100644 --- a/app/controllers/services_controller.rb +++ b/app/controllers/services_controller.rb @@ -76,7 +76,7 @@ def create sign_in_and_redirect(:user, user) end else - flash[:error] = service_route.capitalize + ' cannot be used to sign up on CodeMontage as no valid email address has been provided. Please add a public email address or sign up manually. If you already have an account, you can sign in and add ' + service_route.capitalize + ' from your profile.' + flash[:alert] = service_route.capitalize + ' cannot be used to sign up on CodeMontage as no valid email address has been provided. Please add a public email address or sign up manually. If you already have an account, you can sign in and add ' + service_route.capitalize + ' from your profile.' redirect_to new_user_session_path end end @@ -95,11 +95,11 @@ def create end end else - flash[:error] = service_route.capitalize + ' returned invalid data for the user id.' + flash[:alert] = service_route.capitalize + ' returned invalid data for the user id.' redirect_to new_user_session_path end else - flash[:error] = 'Error while authenticating via ' + service_route.capitalize + '.' + flash[:alert] = 'Error while authenticating via ' + service_route.capitalize + '.' redirect_to new_user_session_path end end