From 397f383313ec2192b71075f84f5d251821cf0341 Mon Sep 17 00:00:00 2001
From: Sef Kloninger <sef@kloninger.com>
Date: Tue, 18 Mar 2014 09:00:23 -0700
Subject: [PATCH] missing themed embargo page fails safely to unthemed
---
common/djangoapps/student/views.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py
index 3b6198d33d5..2f416aad117 100644
--- a/common/djangoapps/student/views.py
+++ b/common/djangoapps/student/views.py
@@ -33,6 +33,7 @@ from django.views.decorators.http import require_POST, require_GET
from ratelimitbackend.exceptions import RateLimitException
from edxmako.shortcuts import render_to_response, render_to_string
+from mako.exceptions import TopLevelLookupException
from course_modes.models import CourseMode
from student.models import (
@@ -147,12 +148,14 @@ def embargo(_request):
Render the embargo page.
Explains to the user why they are not able to access a particular embargoed course.
+ Tries to use the themed version, but fall back to the default if not found.
"""
- if settings.FEATURES["USE_CUSTOM_THEME"]:
- template="static_templates/theme-embargo.html"
- else:
- template="static_templates/embargo.html"
- return render_to_response(template)
+ try:
+ if settings.FEATURES["USE_CUSTOM_THEME"]:
+ return render_to_response("static_templates/theme-embargo.html")
+ except TopLevelLookupException:
+ pass
+ return render_to_response("static_templates/embargo.html")
def press(request):
--
GitLab