From c7bbffc3770b172dcf1d00448aece0dbe2e85378 Mon Sep 17 00:00:00 2001 From: Serghei Mihai Date: Wed, 8 Jul 2015 17:40:49 +0200 Subject: [PATCH 2/2] redirect user to welcome page (#6705) --- combo/public/views.py | 10 ++++++++++ combo/settings.py | 2 ++ 2 files changed, 12 insertions(+) diff --git a/combo/public/views.py b/combo/public/views.py index f5eec4a..1cc7cca 100644 --- a/combo/public/views.py +++ b/combo/public/views.py @@ -25,6 +25,13 @@ from django.http import (Http404, HttpResponse, HttpResponseRedirect, HttpResponsePermanentRedirect) from django.shortcuts import render, resolve_url from django.template import RequestContext +from django.contrib.auth.signals import user_logged_in + + +def display_welcome_message(sender, user, request, **kwargs): + if not user.profile.welcome_message_viewed and settings.COMBO_WELCOME_PAGE: + request.session['display_welcome'] = True +user_logged_in.connect(display_welcome_message) try: from mellon.utils import get_idps @@ -165,6 +172,9 @@ def empty_site(request): def page(request): + if request.session.get('display_welcome'): + del request.session['display_welcome'] + return HttpResponseRedirect(settings.COMBO_WELCOME_PAGE) url = request.path_info parts = [x for x in request.path_info.strip('/').split('/') if x] if not parts: diff --git a/combo/settings.py b/combo/settings.py index 98f18f2..f2a5ddf 100644 --- a/combo/settings.py +++ b/combo/settings.py @@ -196,6 +196,8 @@ MELLON_USERNAME_TEMPLATE = '{attributes[name_id_content]}' MELLON_IDENTITY_PROVIDERS = [] +COMBO_WELCOME_PAGE = None + local_settings_file = os.environ.get('COMBO_SETTINGS_FILE', os.path.join(os.path.dirname(__file__), 'local_settings.py')) if os.path.exists(local_settings_file): -- 2.1.4