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

Merge pull request #21230 from edx/waheed/PROD-482-remove-utm-param-from-pwd-reset

Browse Source 
Remove UTM params from password reset link.
This commit is contained in:
Waheed Ahmed
2019-07-29 18:48:40 +05:00
committed by GitHub
parent a8a1dffbbb ecf9485e59
commit 4a8f81f8bf
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/djangoapps/student/forms.py
View File

@@ -49,7 +49,7 @@ def send_password_reset_email_for_user(user, request, preferred_email=None):
'request': request, # Used by google_analytics_tracking_pixel
# TODO: This overrides `platform_name` from `get_base_template_context` to make the tests passes
'platform_name': configuration_helpers.get_value('PLATFORM_NAME', settings.PLATFORM_NAME),
'reset_link': '{protocol}://{site}{link}'.format(
'reset_link': '{protocol}://{site}{link}?track=pwreset'.format(
protocol='https' if request.is_secure() else 'http',
site=configuration_helpers.get_value('SITE_NAME', settings.SITE_NAME),
link=reverse('password_reset_confirm', kwargs={

18
common/templates/student/edx_ace/passwordreset/email/body.html
View File

@@ -36,7 +36,23 @@
## xss-lint: disable=django-trans-missing-escape
{% trans "Change my Password" as course_cta_text %}
{% include "ace_common/edx_ace/common/return_to_course_cta.html" with course_cta_text=course_cta_text course_cta_url=reset_link %}
{# email client support for style sheets is pretty spotty, so we have to inline all of these styles #}
<a href="{{ reset_link }}" style="
color: #ffffff;
text-decoration: none;
border-radius: 4px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
background-color: #005686;
border-top: 12px solid #005686;
border-bottom: 12px solid #005686;
border-right: 50px solid #005686;
border-left: 50px solid #005686;
display: inline-block;
">
{# old email clients require the use of the font tag :( #}
<font color="#ffffff"><b>{{ course_cta_text }}</b></font>
</a>
{% endif %}
</td>
</tr>