Commit 77c1ca51 by Matt Tuchfarber Committed by GitHub

Merge pull request #16248 from edx/tuchfarber/program_marketing_edits

Fix program marketing page to assume less (fix 500 error on stage/prod)
parents 1266fbf6 17dd47bf
...@@ -20,7 +20,6 @@ from openedx.core.djangolib.markup import HTML, Text ...@@ -20,7 +20,6 @@ from openedx.core.djangolib.markup import HTML, Text
<% <%
faqs = program['faq'] faqs = program['faq']
program_type = program['type'] program_type = program['type']
program_type_slug = program['type_slug']
title = program['title'] title = program['title']
status = program['status'] status = program['status']
courses = program['courses'] courses = program['courses']
...@@ -33,7 +32,7 @@ full_program_price_format = '{0:.0f}' if program['full_program_price'].is_intege ...@@ -33,7 +32,7 @@ full_program_price_format = '{0:.0f}' if program['full_program_price'].is_intege
full_program_price = full_program_price_format.format(program['full_program_price']) full_program_price = full_program_price_format.format(program['full_program_price'])
corporate_endorsement = program['corporate_endorsements'][0] if program['corporate_endorsements'] else {} corporate_endorsement = program['corporate_endorsements'][0] if program['corporate_endorsements'] else {}
corporate_endorsement_name = corporate_endorsement.get('corporation_name') corporate_endorsement_name = corporate_endorsement.get('corporation_name')
corporate_endorsement_image = corporate_endorsement.get('image')['src'] corporate_endorsement_image = corporate_endorsement.get('image',{}).get('src','')
endorsement = corporate_endorsement['individual_endorsements'][0] endorsement = corporate_endorsement['individual_endorsements'][0]
endorsement_quote = endorsement.get('quote') endorsement_quote = endorsement.get('quote')
endorser = endorsement.get('endorser') endorser = endorsement.get('endorser')
...@@ -45,9 +44,8 @@ expected_learning_items = program['expected_learning_items'] ...@@ -45,9 +44,8 @@ expected_learning_items = program['expected_learning_items']
authoring_organizations = program['authoring_organizations'] authoring_organizations = program['authoring_organizations']
min_hours_effort_per_week = program['min_hours_effort_per_week'] min_hours_effort_per_week = program['min_hours_effort_per_week']
max_hours_effort_per_week = program['max_hours_effort_per_week'] max_hours_effort_per_week = program['max_hours_effort_per_week']
video_url = (program.get('video', {}) or {}).get('src', '') video_url = program.get('video', {}).get('src', '')
banner_image = program.get('banner_image', {}).get('large', {}).get('url', '') banner_image = program.get('banner_image', {}).get('large', {}).get('url', '')
description_max_length = 250
%> %>
<%block name="js_extra"> <%block name="js_extra">
...@@ -287,8 +285,10 @@ description_max_length = 250 ...@@ -287,8 +285,10 @@ description_max_length = 250
<img alt="" src="${instructor['image']}"/> <img alt="" src="${instructor['image']}"/>
</div> </div>
<div class="instructor-name">${instructor['name']}</div> <div class="instructor-name">${instructor['name']}</div>
<div class="instructor-position">${instructor['position']['position']}</div> % if instructor.get('position'):
<div class="instructor-org">${instructor['position']['organization_name']}</div> <div class="instructor-position">${instructor['position'].get('position')}</div>
<div class="instructor-org">${instructor['position'].get('organization_name')}</div>
% endif
</div> </div>
% endfor % endfor
</div> </div>
...@@ -308,7 +308,6 @@ description_max_length = 250 ...@@ -308,7 +308,6 @@ description_max_length = 250
</div> </div>
</div> </div>
% endfor % endfor
</div> </div>
% endif % endif
</div> </div>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment