aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorRobert2017-05-29 17:30:28 +0200
committerRobert2017-05-29 17:34:42 +0200
commitf8bdb0181ec8924fec68fa8b66d397b76fde6379 (patch)
tree884fc574ed4f94bc5e3757b55669886f5998e406 /app
parentfbe3e344cb8c1c4b974317dda9aa57b877e65efc (diff)
downloadchouette-core-f8bdb0181ec8924fec68fa8b66d397b76fde6379.tar.bz2
Fixes: #3385; cas_session_controller flash message on redirect
Diffstat (limited to 'app')
-rw-r--r--app/controllers/devise/cas_sessions_controller.rb3
-rw-r--r--app/policies/application_policy.rb2
2 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/devise/cas_sessions_controller.rb b/app/controllers/devise/cas_sessions_controller.rb
index 399981c16..3b16603b9 100644
--- a/app/controllers/devise/cas_sessions_controller.rb
+++ b/app/controllers/devise/cas_sessions_controller.rb
@@ -20,8 +20,7 @@ class Devise::CasSessionsController < Devise::SessionsController
if LoginPolicy.new(current_user).boiv?
redirect_to after_sign_in_path_for(current_user)
else
- # TODO: Set flash here
- redirect_to cas_login_url
+ redirect_to cas_login_url, flash: {alert: t('devise.sessions.new.unauthorized')}
end
end
diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb
index 08752cda3..a863404ae 100644
--- a/app/policies/application_policy.rb
+++ b/app/policies/application_policy.rb
@@ -8,7 +8,7 @@ class ApplicationPolicy
end
def archived?
- !!referential.try( :archived_at )
+ !!referential.try(:archived_at)
end
def referential