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
238a2d53
Commit
238a2d53
authored
Sep 06, 2013
by
Diana Huang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't allow people into the verification flow if they've already been verified
parent
5ece6443
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
2 deletions
+28
-2
common/djangoapps/course_modes/views.py
+2
-0
common/djangoapps/student/models.py
+17
-0
lms/djangoapps/verify_student/views.py
+9
-2
No files found.
common/djangoapps/course_modes/views.py
View file @
238a2d53
...
...
@@ -22,6 +22,8 @@ class ChooseModeView(View):
@method_decorator
(
login_required
)
def
get
(
self
,
request
,
course_id
,
error
=
None
):
if
CourseEnrollment
.
enrollment_mode_for_user
(
request
.
user
,
course_id
)
==
'verified'
:
return
redirect
(
reverse
(
'dashboard'
))
modes
=
CourseMode
.
modes_for_course_dict
(
course_id
)
context
=
{
"course_id"
:
course_id
,
...
...
common/djangoapps/student/models.py
View file @
238a2d53
...
...
@@ -844,6 +844,23 @@ class CourseEnrollment(models.Model):
return
False
@classmethod
def
enrollment_mode_for_user
(
cls
,
user
,
course_id
):
"""
Returns the enrollment mode for the given user for the given course
`user` is a Django User object
`course_id` is our usual course_id string (e.g. "edX/Test101/2013_Fall)
"""
try
:
record
=
CourseEnrollment
.
objects
.
get
(
user
=
user
,
course_id
=
course_id
)
if
record
.
is_active
:
return
record
.
mode
else
:
return
None
except
cls
.
DoesNotExist
:
return
None
@classmethod
def
enrollments_for_user
(
cls
,
user
):
return
CourseEnrollment
.
objects
.
filter
(
user
=
user
,
is_active
=
1
)
...
...
lms/djangoapps/verify_student/views.py
View file @
238a2d53
...
...
@@ -41,6 +41,8 @@ class VerifyView(View):
return
redirect
(
reverse
(
'verify_student_verified'
,
kwargs
=
{
'course_id'
:
course_id
}))
elif
CourseEnrollment
.
enrollment_mode_for_user
(
request
.
user
,
course_id
)
==
'verified'
:
return
redirect
(
reverse
(
'dashboard'
))
else
:
# If they haven't completed a verification attempt, we have to
# restart with a new one. We can't reuse an older one because we
...
...
@@ -65,7 +67,7 @@ class VerifyView(View):
],
"currency"
:
verify_mode
.
currency
.
upper
(),
"chosen_price"
:
chosen_price
,
"min_price"
:
verify_mode
.
min_price
,
"min_price"
:
verify_mode
.
min_price
,
}
return
render_to_response
(
'verify_student/photo_verification.html'
,
context
)
...
...
@@ -81,6 +83,8 @@ class VerifiedView(View):
"""
Handle the case where we have a get request
"""
if
CourseEnrollment
.
enrollment_mode_for_user
(
request
.
user
,
course_id
)
==
'verified'
:
return
redirect
(
reverse
(
'dashboard'
))
verify_mode
=
CourseMode
.
mode_for_course
(
course_id
,
"verified"
)
if
course_id
in
request
.
session
.
get
(
"donation_for_course"
,
{}):
chosen_price
=
request
.
session
[
"donation_for_course"
][
course_id
]
...
...
@@ -138,15 +142,18 @@ def create_order(request):
return
HttpResponse
(
json
.
dumps
(
params
),
content_type
=
"text/json"
)
@login_required
def
show_requirements
(
request
,
course_id
):
"""
Show the requirements necessary for
"""
if
CourseEnrollment
.
enrollment_mode_for_user
(
request
.
user
,
course_id
)
==
'verified'
:
return
redirect
(
reverse
(
'dashboard'
))
context
=
{
"course_id"
:
course_id
,
"is_not_active"
:
not
request
.
user
.
is_active
,
"course_name"
:
course_from_id
(
course_id
)
.
display_name
,
"course_name"
:
course_from_id
(
course_id
)
.
display_name
,
}
return
render_to_response
(
"verify_student/show_requirements.html"
,
context
)
...
...
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