Merge branch 'dev' into federate

This commit is contained in:
Valentin Samir
2016-06-28 15:29:45 +02:00
3 changed files with 27 additions and 2 deletions

View File

@ -432,7 +432,8 @@ class LoginView(View, LogoutMixin):
'service': self.service,
'method': self.method,
'warn': self.warn or self.request.session.get("warn"),
'lt': self.request.session['lt'][-1]
'lt': self.request.session['lt'][-1],
'renew': self.renew
}
if settings.CAS_FEDERATE:
if self.username and self.ticket:
@ -489,7 +490,7 @@ class LoginView(View, LogoutMixin):
redirect_url = self.user.get_service_url(
self.service,
service_pattern,
renew=self.renew
renew=self.renewed
)
if not self.ajax:
return HttpResponseRedirect(redirect_url)