Merge pull request #582 from edx/fix/adam/redirect

Fix/adam/redirect

cms/djangoapps/contentstore/views/requests.py

@@ -12,7 +12,7 @@ def landing(request, org, course, coursename):
 
 # points to the temporary edge page
 def edge(request):
-    return redirect('/dashboard')
+    return redirect('/')
 
 
 def event(request):

lms/djangoapps/branding/views.py

@@ -4,7 +4,6 @@ from django.shortcuts import redirect
 from django_future.csrf import ensure_csrf_cookie
 
 import student.views
-import branding
 import courseware.views
 from mitxmako.shortcuts import marketing_link
 from util.cache import cache_if_anonymous
@@ -26,12 +25,8 @@ def index(request):
     if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE'):
         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)
 
-    return redirect('/')
-
 
 @ensure_csrf_cookie
 @cache_if_anonymous
@@ -44,8 +39,4 @@ def courses(request):
     if settings.MITX_FEATURES.get('ENABLE_MKTG_SITE', False):
         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)
-
-    return redirect('/')