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
59e1f5a5
Commit
59e1f5a5
authored
Feb 08, 2012
by
Piotr Mitros
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Account already active is there
parent
e3d936ad
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
student/models.py
+1
-1
student/views.py
+5
-3
No files found.
student/models.py
View file @
59e1f5a5
...
@@ -48,5 +48,5 @@ class Registration(models.Model):
...
@@ -48,5 +48,5 @@ class Registration(models.Model):
def
activate
(
self
):
def
activate
(
self
):
self
.
user
.
is_active
=
True
self
.
user
.
is_active
=
True
self
.
user
.
save
()
self
.
user
.
save
()
self
.
delete
()
#
self.delete()
student/views.py
View file @
59e1f5a5
...
@@ -230,9 +230,11 @@ if settings.GENERATE_RANDOM_USER_CREDENTIALS:
...
@@ -230,9 +230,11 @@ if settings.GENERATE_RANDOM_USER_CREDENTIALS:
def
activate_account
(
request
,
key
):
def
activate_account
(
request
,
key
):
r
=
Registration
.
objects
.
filter
(
activation_key
=
key
)
r
=
Registration
.
objects
.
filter
(
activation_key
=
key
)
if
len
(
r
)
==
1
:
if
len
(
r
)
==
1
:
r
[
0
]
.
activate
()
if
not
r
[
0
]
.
user
.
is_active
:
resp
=
render_to_response
(
"activation_complete.html"
,{
'csrf'
:
csrf
(
request
)[
'csrf_token'
]})
r
[
0
]
.
activate
()
# print len(connection.queries), connection.queries
resp
=
render_to_response
(
"activation_complete.html"
,{
'csrf'
:
csrf
(
request
)[
'csrf_token'
]})
return
resp
resp
=
render_to_response
(
"activation_active.html"
,{
'csrf'
:
csrf
(
request
)[
'csrf_token'
]})
return
resp
return
resp
if
len
(
r
)
==
0
:
if
len
(
r
)
==
0
:
return
render_to_response
(
"activation_invalid.html"
,{
'csrf'
:
csrf
(
request
)[
'csrf_token'
]})
return
render_to_response
(
"activation_invalid.html"
,{
'csrf'
:
csrf
(
request
)[
'csrf_token'
]})
...
...
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