Revision d186cf77
| b/snf-astakos-app/astakos/im/views.py | ||
|---|---|---|
| 421 | 421 |
return response |
| 422 | 422 |
|
| 423 | 423 |
@transaction.commit_manually |
| 424 |
def activate(request, email_template_name='im/welcome_email.txt', on_failure=''): |
|
| 424 |
def activate(request, email_template_name='im/welcome_email.txt', on_failure='im/signup.html'):
|
|
| 425 | 425 |
""" |
| 426 | 426 |
Activates the user identified by the ``auth`` request parameter, sends a welcome email |
| 427 | 427 |
and renews the user token. |
| ... | ... | |
| 445 | 445 |
user.save() |
| 446 | 446 |
except ValidationError, e: |
| 447 | 447 |
return HttpResponseBadRequest(e) |
| 448 |
|
|
| 449 | 448 |
else: |
| 450 |
# switch the local account to shibboleth one
|
|
| 449 |
# switch the existing account to shibboleth one
|
|
| 451 | 450 |
local_user.provider = 'shibboleth' |
| 452 | 451 |
local_user.set_unusable_password() |
| 453 | 452 |
local_user.third_party_identifier = user.third_party_identifier |
| ... | ... | |
| 467 | 466 |
message = e.message |
| 468 | 467 |
messages.add_message(request, messages.ERROR, message) |
| 469 | 468 |
transaction.rollback() |
| 470 |
return signup(request, on_failure='im/signup.html')
|
|
| 469 |
return render_response(on_failure)
|
|
| 471 | 470 |
except BaseException, e: |
| 472 | 471 |
status = messages.ERROR |
| 473 | 472 |
message = _('Something went wrong.')
|
| 473 |
messages.add_message(request, messages.ERROR, message) |
|
| 474 | 474 |
logger.exception(e) |
| 475 | 475 |
transaction.rollback() |
| 476 |
return signup(request, on_failure='im/signup.html')
|
|
| 476 |
return signup(request, on_failure) |
|
| 477 | 477 |
|
| 478 | 478 |
def approval_terms(request, term_id=None, template_name='im/approval_terms.html', extra_context={}):
|
| 479 | 479 |
term = None |
Also available in: Unified diff