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

add settings.PLATFORM_NAME to password_reset_confirm context

Browse Source
This commit is contained in:
Adam Palay
2013-08-12 17:27:18 -04:00
committed by Jay Zoldak
parent 5ed8d557c2
commit 5d4edc61a7
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1037,7 +1037,11 @@ def password_reset(request):
'error': _('Invalid e-mail or user')}))
def password_reset_confirm_wrapper(request, uidb36=None, token=None):
def password_reset_confirm_wrapper(
request,
uidb36=None,
token=None,
):
''' A wrapper around django.contrib.auth.views.password_reset_confirm.
Needed because we want to set the user as active at this step.
'''
@@ -1049,7 +1053,12 @@ def password_reset_confirm_wrapper(request, uidb36=None, token=None):
user.save()
except (ValueError, User.DoesNotExist):
pass
return password_reset_confirm(request, uidb36=uidb36, token=token)
# we also want to pass settings.PLATFORM_NAME in as extra_context
extra_context = {"platform_name": settings.PLATFORM_NAME}
return password_reset_confirm(
request, uidb36=uidb36, token=token, extra_context=extra_context
)
def reactivation_email_for_user(user):

18
lms/templates/registration/password_reset_confirm.html
View File

@@ -5,7 +5,11 @@
<html>
<head>
<title>{% trans "Reset Your edX Password" %}</title>
<title>
{% blocktrans with platform_name=platform_name %}
Reset Your {{ platform_name }} Password
{% endblocktrans %}
</title>
{% compressed_css 'application' %}
@@ -53,7 +57,11 @@
<section class="passwordreset container">
<section class="introduction">
<header>
<h1>{% trans "Reset Your edX Password" %}</h1>
<h1>
{% blocktrans with platform_name=platform_name %}
Reset Your {{ platform_name }} Password
{% endblocktrans %}
</h1>
</header>
</section>
@@ -66,7 +74,11 @@
<form role="form" id="passwordreset-form" method="post" data-remote="true" action="">{% csrf_token %}
<!-- status messages -->
<div role="alert" class="status message">
<h3 class="message-title">{% trans "We're sorry, edX enrollment is not available in your region" %}</h3>
<h3 class="message-title">
{% blocktrans with platform_name=platform_name %}
We're sorry, {{ platform_name }} enrollment is not available in your region
{% endblocktrans %}
</h3>
</div>
<div role="alert" class="status message submission-error">