From 5d0328aa3e8fc61b78ce134d44138cdca18d04b5 Mon Sep 17 00:00:00 2001 From: Adam Palay Date: Mon, 5 Aug 2013 18:08:32 -0400 Subject: [PATCH] creates "edge" case --- lms/djangoapps/branding/views.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lms/djangoapps/branding/views.py b/lms/djangoapps/branding/views.py index 42c57e3090..6a8ef8056b 100644 --- a/lms/djangoapps/branding/views.py +++ b/lms/djangoapps/branding/views.py @@ -28,10 +28,13 @@ def index(request): return redirect(settings.MKTG_URLS.get('ROOT')) university = branding.get_university(request.META.get('HTTP_HOST')) - if university is None: - return student.views.index(request, user=request.user) + if university == 'edge': + return render_to_response('university_profile/edge.html', {}) + + # we do not expect this case to be reached in cases where + # marketing and edge are enabled + return student.views.index(request, user=request.user) - return render_to_response('university_profile/edge.html', {}) @ensure_csrf_cookie @@ -46,7 +49,9 @@ def courses(request): return redirect(marketing_link('COURSES'), permanent=True) university = branding.get_university(request.META.get('HTTP_HOST')) - if university is None: - return courseware.views.courses(request) + if university == 'edge': + return render_to_response('university_profile/edge.html', {}) - return render_to_response('university_profile/edge.html', {}) + # we do not expect this case to be reached in cases where + # marketing and edge are enabled + return courseware.views.courses(request)