Revision 8998f09a snf-astakos-app/astakos/im/views/im.py

b/snf-astakos-app/astakos/im/views/im.py
62 62
from astakos.im.forms import ExtendedProfileForm as ProfileForm
63 63
from astakos.im.functions import send_feedback, logout as auth_logout, \
64 64
    invite as invite_func
65
from astakos.im.settings import COOKIE_DOMAIN, LOGOUT_NEXT, \
66
    ACTIVATION_REDIRECT_URL
67
from astakos.im import presentation
68 65
from astakos.im import settings
66
from astakos.im import presentation
69 67
from astakos.im import auth_providers as auth
70 68
from astakos.im import quotas
71 69
from astakos.im.views.util import render_response, _resources_catalog
......
255 253
                user = form.save(request=request)
256 254
                next = restrict_next(
257 255
                    request.POST.get('next'),
258
                    domain=COOKIE_DOMAIN
256
                    domain=settings.COOKIE_DOMAIN
259 257
                )
260 258
                msg = _(astakos_messages.PROFILE_UPDATED)
261 259
                messages.success(request, msg)
......
512 510

  
513 511
    next = restrict_next(
514 512
        request.GET.get('next'),
515
        domain=COOKIE_DOMAIN
513
        domain=settings.COOKIE_DOMAIN
516 514
    )
517 515

  
518 516
    if next:
519 517
        response['Location'] = next
520 518
        response.status_code = 302
521
    elif LOGOUT_NEXT:
522
        response['Location'] = LOGOUT_NEXT
519
    elif settings.LOGOUT_NEXT:
520
        response['Location'] = settings.LOGOUT_NEXT
523 521
        response.status_code = 301
524 522
    else:
525 523
        last_provider = request.COOKIES.get('astakos_last_login_method', 'local')
......
568 566
        backend = activation_backends.get_backend()
569 567
        result = backend.handle_verification(user, token)
570 568
        backend.send_result_notifications(result, user)
571
        next = ACTIVATION_REDIRECT_URL or next
569
        next = settings.ACTIVATION_REDIRECT_URL or next
572 570
        response = HttpResponseRedirect(reverse('index'))
573 571
        if user.is_active:
574 572
            response = prepare_response(request, user, next, renew=True)
......
617 615
    if request.method == 'POST':
618 616
        next = restrict_next(
619 617
            request.POST.get('next'),
620
            domain=COOKIE_DOMAIN
618
            domain=settings.COOKIE_DOMAIN
621 619
        )
622 620
        if not next:
623 621
            next = reverse('index')

Also available in: Unified diff