Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14600 from edx/ahsan/ECOM-6977-ensure-hidden-html-content-not-render

Browse Source 
Hidden html content on the dashboard are rendered
This commit is contained in:
Ahsan Ulhaq
2017-03-03 14:51:34 +05:00
committed by GitHub
parent b23854244d 2d1bb9bf7f
commit 090f4e419f
3 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/djangoapps/student/views.py
View File

@@ -800,6 +800,9 @@ def dashboard(request):
else:
redirect_message = ''
valid_verification_statuses = ['approved', 'must_reverify', 'pending', 'expired']
display_sidebar_on_dashboard = len(order_history_list) or verification_status in valid_verification_statuses
context = {
'enrollment_message': enrollment_message,
'redirect_message': redirect_message,
@@ -833,6 +836,7 @@ def dashboard(request):
'show_program_listing': ProgramsApiConfig.current().show_program_listing,
'disable_courseware_js': True,
'display_course_modes_on_dashboard': enable_verified_certificates and display_course_modes_on_dashboard,
'display_sidebar_on_dashboard': display_sidebar_on_dashboard,
}
ecommerce_service = EcommerceService()

36
lms/templates/dashboard.html
View File

@@ -155,27 +155,29 @@ from openedx.core.djangolib.markup import HTML, Text
<div id="dashboard-search-results" class="search-results dashboard-search-results"></div>
% endif
<div class="profile-sidebar" id="profile-sidebar" role="region" aria-label="Account Status Info">
<header class="profile">
<h2 class="account-status-title sr">${_("Account Status Info")}: </h2>
</header>
<div class="user-info">
<ul>
% if display_sidebar_on_dashboard:
<div class="profile-sidebar" id="profile-sidebar" role="region" aria-label="Account Status Info">
<header class="profile">
<h2 class="account-status-title sr">${_("Account Status Info")}: </h2>
</header>
<div class="user-info">
<ul>
% if len(order_history_list):
<li class="order-history">
<span class="title">${_("Order History")}</span>
% for order_history_item in order_history_list:
<span><a href="${order_history_item['receipt_url']}" target="_blank" class="edit-name">${order_history_item['order_date']}</a></span>
% endfor
</li>
% endif
% if len(order_history_list):
<li class="order-history">
<span class="title">${_("Order History")}</span>
% for order_history_item in order_history_list:
<span><a href="${order_history_item['receipt_url']}" target="_blank" class="edit-name">${order_history_item['order_date']}</a></span>
% endfor
</li>
% endif
<%include file="${static.get_template_path('dashboard/_dashboard_status_verification.html')}" />
<%include file="${static.get_template_path('dashboard/_dashboard_status_verification.html')}" />
</ul>
</div>
</ul>
</div>
</div>
% endif
</div>
</main>

36
themes/edx.org/lms/templates/dashboard.html
View File

@@ -173,27 +173,29 @@ from openedx.core.djangoapps.theming import helpers as theming_helpers
</div>
% endif
<section class="profile-sidebar" id="profile-sidebar" role="region" aria-label="Account Status Info">
<header class="profile">
<h2 class="account-status-title sr">${_("Account Status Info")}: </h2>
</header>
<section class="user-info">
<ul>
% if display_sidebar_on_dashboard:
<section class="profile-sidebar" id="profile-sidebar" role="region" aria-label="Account Status Info">
<header class="profile">
<h2 class="account-status-title sr">${_("Account Status Info")}: </h2>
</header>
<section class="user-info">
<ul>
% if len(order_history_list):
<li class="order-history">
<span class="title">${_("Order History")}</span>
% for order_history_item in order_history_list:
<span><a href="${order_history_item['receipt_url']}" target="_blank" class="edit-name">${order_history_item['order_date']}</a></span>
% endfor
</li>
% endif
% if len(order_history_list):
<li class="order-history">
<span class="title">${_("Order History")}</span>
% for order_history_item in order_history_list:
<span><a href="${order_history_item['receipt_url']}" target="_blank" class="edit-name">${order_history_item['order_date']}</a></span>
% endfor
</li>
% endif
<%include file="${theming_helpers.get_template_path('dashboard/_dashboard_status_verification.html')}" />
<%include file="${theming_helpers.get_template_path('dashboard/_dashboard_status_verification.html')}" />
</ul>
</ul>
</section>
</section>
</section>
% endif
</section>
<section id="email-settings-modal" class="modal" aria-hidden="true">