0002-redirect-user-to-welcome-page-6705.patch
combo/public/views.py | ||
---|---|---|
25 | 25 |
HttpResponsePermanentRedirect) |
26 | 26 |
from django.shortcuts import render, resolve_url |
27 | 27 |
from django.template import RequestContext |
28 |
from django.contrib.auth.signals import user_logged_in |
|
29 | ||
30 | ||
31 |
def display_welcome_message(sender, user, request, **kwargs): |
|
32 |
if not user.profile.welcome_message_viewed and settings.COMBO_WELCOME_PAGE: |
|
33 |
request.session['display_welcome'] = True |
|
34 |
user_logged_in.connect(display_welcome_message) |
|
28 | 35 | |
29 | 36 |
try: |
30 | 37 |
from mellon.utils import get_idps |
... | ... | |
165 | 172 | |
166 | 173 | |
167 | 174 |
def page(request): |
175 |
if request.session.get('display_welcome'): |
|
176 |
del request.session['display_welcome'] |
|
177 |
return HttpResponseRedirect(settings.COMBO_WELCOME_PAGE) |
|
168 | 178 |
url = request.path_info |
169 | 179 |
parts = [x for x in request.path_info.strip('/').split('/') if x] |
170 | 180 |
if not parts: |
combo/settings.py | ||
---|---|---|
196 | 196 | |
197 | 197 |
MELLON_IDENTITY_PROVIDERS = [] |
198 | 198 | |
199 |
COMBO_WELCOME_PAGE = None |
|
200 | ||
199 | 201 |
local_settings_file = os.environ.get('COMBO_SETTINGS_FILE', |
200 | 202 |
os.path.join(os.path.dirname(__file__), 'local_settings.py')) |
201 | 203 |
if os.path.exists(local_settings_file): |
202 |
- |