Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-proctoring
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
OpenEdx
edx-proctoring
Commits
252304c2
Commit
252304c2
authored
Nov 02, 2015
by
muhammad-ammar
Committed by
Ned Batchelder
Nov 10, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update request.DATA property with request.data property
parent
2036047e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
32 deletions
+32
-32
edx_proctoring/callbacks.py
+1
-1
edx_proctoring/tests/test_views.py
+1
-1
edx_proctoring/views.py
+30
-30
No files found.
edx_proctoring/callbacks.py
View file @
252304c2
...
@@ -108,7 +108,7 @@ class ExamReviewCallback(APIView):
...
@@ -108,7 +108,7 @@ class ExamReviewCallback(APIView):
# call down into the underlying provider code
# call down into the underlying provider code
try
:
try
:
provider
.
on_review_callback
(
request
.
DATA
)
provider
.
on_review_callback
(
request
.
data
)
except
ProctoredBaseException
,
ex
:
except
ProctoredBaseException
,
ex
:
log
.
exception
(
ex
)
log
.
exception
(
ex
)
return
Response
(
return
Response
(
...
...
edx_proctoring/tests/test_views.py
View file @
252304c2
...
@@ -223,7 +223,7 @@ class ProctoredExamViewTests(LoggedInTestCase):
...
@@ -223,7 +223,7 @@ class ProctoredExamViewTests(LoggedInTestCase):
mock request
mock request
"""
"""
request
=
Mock
()
request
=
Mock
()
request
.
DATA
=
{}
request
.
data
=
{}
self
.
user
.
is_staff
=
False
self
.
user
.
is_staff
=
False
self
.
user
.
save
()
self
.
user
.
save
()
request
.
user
=
self
.
user
request
.
user
=
self
.
user
...
...
edx_proctoring/views.py
View file @
252304c2
...
@@ -76,7 +76,7 @@ def require_course_or_global_staff(func):
...
@@ -76,7 +76,7 @@ def require_course_or_global_staff(func):
def
wrapped
(
request
,
*
args
,
**
kwargs
):
# pylint: disable=missing-docstring
def
wrapped
(
request
,
*
args
,
**
kwargs
):
# pylint: disable=missing-docstring
instructor_service
=
get_runtime_service
(
'instructor'
)
instructor_service
=
get_runtime_service
(
'instructor'
)
course_id
=
kwargs
[
'course_id'
]
if
'course_id'
in
kwargs
else
None
course_id
=
kwargs
[
'course_id'
]
if
'course_id'
in
kwargs
else
None
exam_id
=
request
.
DATA
.
get
(
'exam_id'
,
None
)
exam_id
=
request
.
data
.
get
(
'exam_id'
,
None
)
attempt_id
=
kwargs
[
'attempt_id'
]
if
'attempt_id'
in
kwargs
else
None
attempt_id
=
kwargs
[
'attempt_id'
]
if
'attempt_id'
in
kwargs
else
None
if
request
.
user
.
is_staff
:
if
request
.
user
.
is_staff
:
return
func
(
request
,
*
args
,
**
kwargs
)
return
func
(
request
,
*
args
,
**
kwargs
)
...
@@ -177,17 +177,17 @@ class ProctoredExamView(AuthenticatedAPIView):
...
@@ -177,17 +177,17 @@ class ProctoredExamView(AuthenticatedAPIView):
"""
"""
Http POST handler. Creates an exam.
Http POST handler. Creates an exam.
"""
"""
serializer
=
ProctoredExamSerializer
(
data
=
request
.
DATA
)
serializer
=
ProctoredExamSerializer
(
data
=
request
.
data
)
if
serializer
.
is_valid
():
if
serializer
.
is_valid
():
exam_id
=
create_exam
(
exam_id
=
create_exam
(
course_id
=
request
.
DATA
.
get
(
'course_id'
,
None
),
course_id
=
request
.
data
.
get
(
'course_id'
,
None
),
content_id
=
request
.
DATA
.
get
(
'content_id'
,
None
),
content_id
=
request
.
data
.
get
(
'content_id'
,
None
),
exam_name
=
request
.
DATA
.
get
(
'exam_name'
,
None
),
exam_name
=
request
.
data
.
get
(
'exam_name'
,
None
),
time_limit_mins
=
request
.
DATA
.
get
(
'time_limit_mins'
,
None
),
time_limit_mins
=
request
.
data
.
get
(
'time_limit_mins'
,
None
),
is_proctored
=
request
.
DATA
.
get
(
'is_proctored'
,
None
),
is_proctored
=
request
.
data
.
get
(
'is_proctored'
,
None
),
is_practice_exam
=
request
.
DATA
.
get
(
'is_practice_exam'
,
None
),
is_practice_exam
=
request
.
data
.
get
(
'is_practice_exam'
,
None
),
external_id
=
request
.
DATA
.
get
(
'external_id'
,
None
),
external_id
=
request
.
data
.
get
(
'external_id'
,
None
),
is_active
=
request
.
DATA
.
get
(
'is_active'
,
None
)
is_active
=
request
.
data
.
get
(
'is_active'
,
None
)
)
)
return
Response
({
'exam_id'
:
exam_id
})
return
Response
({
'exam_id'
:
exam_id
})
else
:
else
:
...
@@ -204,13 +204,13 @@ class ProctoredExamView(AuthenticatedAPIView):
...
@@ -204,13 +204,13 @@ class ProctoredExamView(AuthenticatedAPIView):
"""
"""
try
:
try
:
exam_id
=
update_exam
(
exam_id
=
update_exam
(
exam_id
=
request
.
DATA
.
get
(
'exam_id'
,
None
),
exam_id
=
request
.
data
.
get
(
'exam_id'
,
None
),
exam_name
=
request
.
DATA
.
get
(
'exam_name'
,
None
),
exam_name
=
request
.
data
.
get
(
'exam_name'
,
None
),
time_limit_mins
=
request
.
DATA
.
get
(
'time_limit_mins'
,
None
),
time_limit_mins
=
request
.
data
.
get
(
'time_limit_mins'
,
None
),
is_proctored
=
request
.
DATA
.
get
(
'is_proctored'
,
None
),
is_proctored
=
request
.
data
.
get
(
'is_proctored'
,
None
),
is_practice_exam
=
request
.
DATA
.
get
(
'is_practice_exam'
,
None
),
is_practice_exam
=
request
.
data
.
get
(
'is_practice_exam'
,
None
),
external_id
=
request
.
DATA
.
get
(
'external_id'
,
None
),
external_id
=
request
.
data
.
get
(
'external_id'
,
None
),
is_active
=
request
.
DATA
.
get
(
'is_active'
,
None
),
is_active
=
request
.
data
.
get
(
'is_active'
,
None
),
)
)
return
Response
({
'exam_id'
:
exam_id
})
return
Response
({
'exam_id'
:
exam_id
})
except
ProctoredExamNotFoundException
,
ex
:
except
ProctoredExamNotFoundException
,
ex
:
...
@@ -406,7 +406,7 @@ class StudentProctoredExamAttempt(AuthenticatedAPIView):
...
@@ -406,7 +406,7 @@ class StudentProctoredExamAttempt(AuthenticatedAPIView):
)
)
raise
ProctoredExamPermissionDenied
(
err_msg
)
raise
ProctoredExamPermissionDenied
(
err_msg
)
action
=
request
.
DATA
.
get
(
'action'
)
action
=
request
.
data
.
get
(
'action'
)
if
action
==
'stop'
:
if
action
==
'stop'
:
exam_attempt_id
=
stop_exam_attempt
(
exam_attempt_id
=
stop_exam_attempt
(
...
@@ -581,9 +581,9 @@ class StudentProctoredExamAttemptCollection(AuthenticatedAPIView):
...
@@ -581,9 +581,9 @@ class StudentProctoredExamAttemptCollection(AuthenticatedAPIView):
"""
"""
HTTP POST handler. To create an exam attempt.
HTTP POST handler. To create an exam attempt.
"""
"""
start_immediately
=
request
.
DATA
.
get
(
'start_clock'
,
'false'
)
.
lower
()
==
'true'
start_immediately
=
request
.
data
.
get
(
'start_clock'
,
'false'
)
.
lower
()
==
'true'
exam_id
=
request
.
DATA
.
get
(
'exam_id'
,
None
)
exam_id
=
request
.
data
.
get
(
'exam_id'
,
None
)
attempt_proctored
=
request
.
DATA
.
get
(
'attempt_proctored'
,
'false'
)
.
lower
()
==
'true'
attempt_proctored
=
request
.
data
.
get
(
'attempt_proctored'
,
'false'
)
.
lower
()
==
'true'
try
:
try
:
exam_attempt_id
=
create_exam_attempt
(
exam_attempt_id
=
create_exam_attempt
(
exam_id
=
exam_id
,
exam_id
=
exam_id
,
...
@@ -732,10 +732,10 @@ class ExamAllowanceView(AuthenticatedAPIView):
...
@@ -732,10 +732,10 @@ class ExamAllowanceView(AuthenticatedAPIView):
"""
"""
try
:
try
:
return
Response
(
add_allowance_for_user
(
return
Response
(
add_allowance_for_user
(
exam_id
=
request
.
DATA
.
get
(
'exam_id'
,
None
),
exam_id
=
request
.
data
.
get
(
'exam_id'
,
None
),
user_info
=
request
.
DATA
.
get
(
'user_info'
,
None
),
user_info
=
request
.
data
.
get
(
'user_info'
,
None
),
key
=
request
.
DATA
.
get
(
'key'
,
None
),
key
=
request
.
data
.
get
(
'key'
,
None
),
value
=
request
.
DATA
.
get
(
'value'
,
None
)
value
=
request
.
data
.
get
(
'value'
,
None
)
))
))
except
(
AllowanceValueNotAllowedException
,
UserNotFoundException
,
ProctoredExamNotActiveException
)
as
ex
:
except
(
AllowanceValueNotAllowedException
,
UserNotFoundException
,
ProctoredExamNotActiveException
)
as
ex
:
...
@@ -751,9 +751,9 @@ class ExamAllowanceView(AuthenticatedAPIView):
...
@@ -751,9 +751,9 @@ class ExamAllowanceView(AuthenticatedAPIView):
HTTP DELETE handler. Removes Allowance.
HTTP DELETE handler. Removes Allowance.
"""
"""
return
Response
(
remove_allowance_for_user
(
return
Response
(
remove_allowance_for_user
(
exam_id
=
request
.
DATA
.
get
(
'exam_id'
,
None
),
exam_id
=
request
.
data
.
get
(
'exam_id'
,
None
),
user_id
=
request
.
DATA
.
get
(
'user_id'
,
None
),
user_id
=
request
.
data
.
get
(
'user_id'
,
None
),
key
=
request
.
DATA
.
get
(
'key'
,
None
)
key
=
request
.
data
.
get
(
'key'
,
None
)
))
))
...
@@ -770,6 +770,6 @@ class ActiveExamsForUserView(AuthenticatedAPIView):
...
@@ -770,6 +770,6 @@ class ActiveExamsForUserView(AuthenticatedAPIView):
returns the get_active_exams_for_user
returns the get_active_exams_for_user
"""
"""
return
Response
(
get_active_exams_for_user
(
return
Response
(
get_active_exams_for_user
(
user_id
=
request
.
DATA
.
get
(
'user_id'
,
None
),
user_id
=
request
.
data
.
get
(
'user_id'
,
None
),
course_id
=
request
.
DATA
.
get
(
'course_id'
,
None
)
course_id
=
request
.
data
.
get
(
'course_id'
,
None
)
))
))
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