ynerant/django-cas-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into federate

Browse Source
This commit is contained in:
Valentin Samir
2016-06-20 13:35:48 +02:00
parent 8ab7352f4b c7ac3bee7a
commit a209b06df0
8 changed files with 153 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cas_server/views.py
View File

@ -176,7 +176,7 @@ class LogoutView(View, LogoutMixin):
return render(
request,
settings.CAS_LOGOUT_TEMPLATE,
{'logout_msg': logout_msg}
utils.context({'logout_msg': logout_msg})
)
@ -425,7 +425,7 @@ class LoginView(View, LogoutMixin):
return render(
self.request,
settings.CAS_WARN_TEMPLATE,
{'form': warn_form}
utils.context({'form': warn_form})
)
else:
# redirect, using method ?
@ -479,7 +479,7 @@ class LoginView(View, LogoutMixin):
return render(
self.request,
settings.CAS_LOGGED_TEMPLATE,
{'session': self.request.session}
utils.context({'session': self.request.session})
)
else:
data = {"status": "error", "detail": "auth", "code": error}
@ -520,7 +520,7 @@ class LoginView(View, LogoutMixin):
return render(
self.request,
settings.CAS_LOGGED_TEMPLATE,
{'session': self.request.session}
utils.context({'session': self.request.session})
)
def not_authenticated(self):
@ -565,11 +565,11 @@ class LoginView(View, LogoutMixin):
return render(
self.request,
settings.CAS_LOGIN_TEMPLATE,
{
utils.context({
'form': self.form,
'auto_submit': True,
'post_url': reverse("cas_server:login")
}
})
)
else:
if (
@ -588,10 +588,14 @@ class LoginView(View, LogoutMixin):
return render(
self.request,
settings.CAS_FEDERATE_TEMPLATE,
{'form': self.form}
utils.context({'form': self.form})
)
else:
return render(self.request, settings.CAS_LOGIN_TEMPLATE, {'form': self.form})
return render(
self.request,
settings.CAS_LOGIN_TEMPLATE,
utils.context({'form': self.form})
)
def common(self):
"""Part execute uppon GET and POST request"""