TNL-4895 User dropdown reflects real user
Exposes real_user to the user_dropdown template, allowing for the requested feature change of keeping the profile links pointed at the real user's profile.
This commit is contained in:
@@ -149,6 +149,18 @@ class MasqueradeTestCase(SharedModuleStoreTestCase, LoginEnrollmentTestCase):
|
||||
self.assertIn(self.problem_display_name, problem_html)
|
||||
self.assertEqual(show_answer_expected, "Show Answer" in problem_html)
|
||||
|
||||
def verify_original_user_profile_link(self):
|
||||
"""
|
||||
Verifies that the 'Profile' link in the navigation dropdown is pointing
|
||||
to the original user.
|
||||
"""
|
||||
content = self.get_courseware_page().content
|
||||
self.assertIn(
|
||||
'<a href="/u/{}" class="action dropdown-menuitem">Profile</a>'.format(self.test_user.username),
|
||||
content,
|
||||
"Profile link should point to original user",
|
||||
)
|
||||
|
||||
|
||||
@attr(shard=1)
|
||||
class NormalStudentVisibilityTest(MasqueradeTestCase):
|
||||
@@ -326,6 +338,9 @@ class TestStaffMasqueradeAsSpecificStudent(StaffMasqueradeTestCase, ProblemSubmi
|
||||
self.update_masquerade(role='student', user_name=self.student_user.username)
|
||||
self.assertEqual(self.get_progress_detail(), u'2/2')
|
||||
|
||||
# Verify that the user dropdown links have not changed
|
||||
self.verify_original_user_profile_link()
|
||||
|
||||
# Temporarily override the student state.
|
||||
self.submit_answer('Correct', 'Incorrect')
|
||||
self.assertEqual(self.get_progress_detail(), u'1/2')
|
||||
|
||||
@@ -406,6 +406,7 @@ class CoursewareIndex(View):
|
||||
courseware_context['entrance_exam_passed'] = user_has_passed_entrance_exam(self.request, self.course)
|
||||
|
||||
# staff masquerading data
|
||||
courseware_context['real_user'] = self.real_user
|
||||
now = datetime.now(UTC())
|
||||
effective_start = _adjust_start_date_for_beta_testers(self.effective_user, self.course, self.course_key)
|
||||
if not in_preview_mode() and self.is_staff and now < effective_start:
|
||||
|
||||
@@ -2,6 +2,11 @@
|
||||
<%page expression_filter="h"/>
|
||||
<%namespace name='static' file='static_content.html'/>
|
||||
|
||||
## This template should not use the target student's details when masquerading, see TNL-4895
|
||||
<%
|
||||
original_user = real_user or user
|
||||
%>
|
||||
|
||||
<%!
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.utils.translation import ugettext as _
|
||||
@@ -14,8 +19,8 @@ from openedx.core.djangoapps.user_api.accounts.image_helpers import get_profile_
|
||||
<a href="${reverse('dashboard')}" class="menu-title">
|
||||
<span class="sr-only">${_("Dashboard for:")}</span>
|
||||
<%
|
||||
username = user.username
|
||||
profile_image_url = get_profile_image_urls_for_user(user)['medium']
|
||||
username = original_user.username
|
||||
profile_image_url = get_profile_image_urls_for_user(original_user)['medium']
|
||||
%>
|
||||
<img class="menu-image" src="${profile_image_url}" alt="">
|
||||
${username}
|
||||
@@ -28,7 +33,7 @@ from openedx.core.djangoapps.user_api.accounts.image_helpers import get_profile_
|
||||
<ul class="dropdown-menu list-divided is-hidden" id="${_("Usermenu")}" tabindex="-1">
|
||||
<%block name="navigation_dropdown_menu_links" >
|
||||
<li class="dropdown-item item has-block-link"><a href="${reverse('dashboard')}" class="action dropdown-menuitem">${_("Dashboard")}</a></li>
|
||||
<li class="dropdown-item item has-block-link"><a href="${reverse('learner_profile', kwargs={'username': user.username})}" class="action dropdown-menuitem">${_("Profile")}</a></li>
|
||||
<li class="dropdown-item item has-block-link"><a href="${reverse('learner_profile', kwargs={'username': original_user.username})}" class="action dropdown-menuitem">${_("Profile")}</a></li>
|
||||
<li class="dropdown-item item has-block-link"><a href="${reverse('account_settings')}" class="action dropdown-menuitem">${_("Account")}</a></li>
|
||||
</%block>
|
||||
<li class="dropdown-item item has-block-link"><a href="${reverse('logout')}" role="menuitem" class="action dropdown-menuitem">${_("Sign Out")}</a></li>
|
||||
@@ -41,8 +46,8 @@ from openedx.core.djangoapps.user_api.accounts.image_helpers import get_profile_
|
||||
<a href="${reverse('dashboard')}" class="user-link">
|
||||
<span class="sr">${_("Dashboard for:")}</span>
|
||||
<%
|
||||
username = user.username
|
||||
profile_image_url = get_profile_image_urls_for_user(user)['medium']
|
||||
username = original_user.username
|
||||
profile_image_url = get_profile_image_urls_for_user(original_user)['medium']
|
||||
%>
|
||||
<img class="user-image-frame" src="${profile_image_url}" alt="${_('Profile image for {username}').format(username=username)}">
|
||||
<div class="label-username">${username}</div>
|
||||
|
||||
Reference in New Issue
Block a user