Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
937f9793
Commit
937f9793
authored
May 23, 2017
by
Saleem Latif
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update account activation message on login page
parent
2955a6e6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
common/djangoapps/student/tests/test_activate_account.py
+1
-1
common/djangoapps/student/views.py
+13
-2
No files found.
common/djangoapps/student/tests/test_activate_account.py
View file @
937f9793
...
...
@@ -174,7 +174,7 @@ class TestActivateAccount(TestCase):
# Access activation link, message should say that account has been activated.
response
=
self
.
client
.
get
(
reverse
(
'activate'
,
args
=
[
self
.
registration
.
activation_key
]),
follow
=
True
)
self
.
assertRedirects
(
response
,
login_page_url
)
self
.
assertContains
(
response
,
'You have activated your account.'
)
self
.
assertContains
(
response
,
'
Success!
You have activated your account.'
)
# Access activation link again, message should say that account is already active.
response
=
self
.
client
.
get
(
reverse
(
'activate'
,
args
=
[
self
.
registration
.
activation_key
]),
follow
=
True
)
...
...
common/djangoapps/student/views.py
View file @
937f9793
...
...
@@ -2315,10 +2315,21 @@ def activate_account(request, key):
else
:
if
not
registration
.
user
.
is_active
:
registration
.
activate
()
# Add account activation success message for display later
# Success message for logged in users.
message
=
_
(
'{html_start}Success{html_end} You have activated your account.'
)
if
not
request
.
user
.
is_authenticated
():
# Success message for logged out users
message
=
_
(
'{html_start}Success! You have activated your account.{html_end}'
'You will now receive email updates and alerts from us related to'
' the courses you are enrolled in. Sign In to continue.'
)
# Add message for later use.
messages
.
success
(
request
,
HTML
(
_
(
'{html_start}Success{html_end} You have activated your account.'
)
)
.
format
(
HTML
(
message
)
.
format
(
html_start
=
HTML
(
'<p class="message-title">'
),
html_end
=
HTML
(
'</p>'
),
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment