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
c3abf326
Commit
c3abf326
authored
Aug 19, 2014
by
Braden MacDonald
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Friendly error if invalid student identifier is entered for due date extension
parent
5b1befa9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
40 additions
and
3 deletions
+40
-3
lms/djangoapps/instructor/tests/test_tools.py
+21
-0
lms/djangoapps/instructor/views/api.py
+4
-3
lms/djangoapps/instructor/views/tools.py
+15
-0
No files found.
lms/djangoapps/instructor/tests/test_tools.py
View file @
c3abf326
...
...
@@ -62,6 +62,27 @@ class TestHandleDashboardError(unittest.TestCase):
self
.
assertEqual
(
view
(
None
,
None
),
"Oh yes!"
)
class
TestRequireStudentIdentifier
(
unittest
.
TestCase
):
"""
Test require_student_from_identifier()
"""
def
setUp
(
self
):
"""
Fixtures
"""
self
.
student
=
UserFactory
.
create
()
def
test_valid_student_id
(
self
):
self
.
assertEqual
(
self
.
student
,
tools
.
require_student_from_identifier
(
self
.
student
.
username
)
)
def
test_invalid_student_id
(
self
):
with
self
.
assertRaises
(
tools
.
DashboardError
):
tools
.
require_student_from_identifier
(
"invalid"
)
class
TestParseDatetime
(
unittest
.
TestCase
):
"""
Test date parsing.
...
...
lms/djangoapps/instructor/views/api.py
View file @
c3abf326
...
...
@@ -66,6 +66,7 @@ from .tools import (
dump_module_extensions
,
find_unit
,
get_student_from_identifier
,
require_student_from_identifier
,
handle_dashboard_error
,
parse_datetime
,
set_due_date_extension
,
...
...
@@ -1392,7 +1393,7 @@ def change_due_date(request, course_id):
Grants a due date extension to a student for a particular unit.
"""
course
=
get_course_by_id
(
SlashSeparatedCourseKey
.
from_deprecated_string
(
course_id
))
student
=
get
_student_from_identifier
(
request
.
GET
.
get
(
'student'
))
student
=
require
_student_from_identifier
(
request
.
GET
.
get
(
'student'
))
unit
=
find_unit
(
course
,
request
.
GET
.
get
(
'url'
))
due_date
=
parse_datetime
(
request
.
GET
.
get
(
'due_datetime'
))
set_due_date_extension
(
course
,
unit
,
student
,
due_date
)
...
...
@@ -1413,7 +1414,7 @@ def reset_due_date(request, course_id):
Rescinds a due date extension for a student on a particular unit.
"""
course
=
get_course_by_id
(
SlashSeparatedCourseKey
.
from_deprecated_string
(
course_id
))
student
=
get
_student_from_identifier
(
request
.
GET
.
get
(
'student'
))
student
=
require
_student_from_identifier
(
request
.
GET
.
get
(
'student'
))
unit
=
find_unit
(
course
,
request
.
GET
.
get
(
'url'
))
set_due_date_extension
(
course
,
unit
,
student
,
None
)
if
not
getattr
(
unit
,
"due"
,
None
):
...
...
@@ -1453,7 +1454,7 @@ def show_student_extensions(request, course_id):
Shows all of the due date extensions granted to a particular student in a
particular course.
"""
student
=
get
_student_from_identifier
(
request
.
GET
.
get
(
'student'
))
student
=
require
_student_from_identifier
(
request
.
GET
.
get
(
'student'
))
course
=
get_course_by_id
(
SlashSeparatedCourseKey
.
from_deprecated_string
(
course_id
))
return
JsonResponse
(
dump_student_extensions
(
course
,
student
))
...
...
lms/djangoapps/instructor/views/tools.py
View file @
c3abf326
...
...
@@ -90,6 +90,21 @@ def get_student_from_identifier(unique_student_identifier):
return
student
def
require_student_from_identifier
(
unique_student_identifier
):
"""
Same as get_student_from_identifier() but will raise a DashboardError if
the student does not exist.
"""
try
:
return
get_student_from_identifier
(
unique_student_identifier
)
except
User
.
DoesNotExist
:
raise
DashboardError
(
_
(
"Could not find student matching identifier: {student_identifier}"
)
.
format
(
student_identifier
=
unique_student_identifier
)
)
def
parse_datetime
(
datestr
):
"""
Convert user input date string into an instance of `datetime.datetime` in
...
...
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