Revision 1662ac2d
| b/snf-astakos-app/astakos/im/views.py | ||
|---|---|---|
| 55 | 55 |
|
| 56 | 56 |
from astakos.im.models import AstakosUser, Invitation, ApprovalTerms |
| 57 | 57 |
from astakos.im.activation_backends import get_backend, SimpleBackend |
| 58 |
from astakos.im.util import get_context, prepare_response, set_cookie, has_signed_terms, get_query
|
|
| 58 |
from astakos.im.util import get_context, prepare_response, set_cookie, get_query |
|
| 59 | 59 |
from astakos.im.forms import * |
| 60 | 60 |
from astakos.im.functions import send_greeting, send_feedback, SendMailError |
| 61 | 61 |
from astakos.im.settings import DEFAULT_CONTACT_EMAIL, DEFAULT_FROM_EMAIL, COOKIE_NAME, COOKIE_DOMAIN, IM_MODULES, SITENAME, LOGOUT_NEXT |
| ... | ... | |
| 100 | 100 |
""" |
| 101 | 101 |
@wraps(func) |
| 102 | 102 |
def wrapper(request, *args, **kwargs): |
| 103 |
if request.user.is_authenticated() and not has_signed_terms(request.user):
|
|
| 103 |
if request.user.is_authenticated() and not request.user.signed_terms():
|
|
| 104 | 104 |
params = urlencode({'next': request.build_absolute_uri(),
|
| 105 | 105 |
'show_form':''}) |
| 106 | 106 |
terms_uri = reverse('latest_terms') + '?' + params
|
| ... | ... | |
| 500 | 500 |
return HttpResponseRedirect(next) |
| 501 | 501 |
else: |
| 502 | 502 |
form = None |
| 503 |
if request.user.is_authenticated() and not has_signed_terms(request.user):
|
|
| 503 |
if request.user.is_authenticated() and not request.user.signed_terms():
|
|
| 504 | 504 |
form = SignApprovalTermsForm(instance=request.user) |
| 505 | 505 |
return render_response(template_name, |
| 506 | 506 |
terms = terms, |
Also available in: Unified diff