From 31f2e42c02a447cb2b1d5610ae546def45f60577 Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Sat, 4 Apr 2015 15:36:01 -0400 Subject: [PATCH] be sure to take platform_name from microsite config paths in the dashboard add some more microsite aware config checks --- common/djangoapps/student/views.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index f990ca6060..8a06ff60c8 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -498,6 +498,8 @@ def is_course_blocked(request, redeemed_registration_codes, course_key): def dashboard(request): user = request.user + platform_name = microsite.get_value("platform_name", settings.PLATFORM_NAME) + # for microsites, we want to filter and only show enrollments for courses within # the microsites 'ORG' course_org_filter = microsite.get_value('course_org_filter') @@ -541,7 +543,7 @@ def dashboard(request): if not user.is_active: message = render_to_string( 'registration/activate_account_notice.html', - {'email': user.email, 'platform_name': settings.PLATFORM_NAME} + {'email': user.email, 'platform_name': platform_name} ) # Global staff can see what courses errored on their dashboard @@ -686,7 +688,7 @@ def dashboard(request): 'user': user, 'duplicate_provider': None, 'logout_url': reverse(logout_user), - 'platform_name': settings.PLATFORM_NAME, + 'platform_name': platform_name, 'enrolled_courses_either_paid': enrolled_courses_either_paid, 'provider_states': [], 'order_history_list': order_history_list, @@ -726,9 +728,11 @@ def _create_recent_enrollment_message(course_enrollment_pairs, course_modes): for course, enrollment in recently_enrolled_courses ] + platform_name = microsite.get_value('platform_name', settings.PLATFORM_NAME) + return render_to_string( 'enrollment/course_enrollment_message.html', - {'course_enrollment_messages': messages, 'platform_name': settings.PLATFORM_NAME} + {'course_enrollment_messages': messages, 'platform_name': platform_name} )