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
640d00c5
Commit
640d00c5
authored
Aug 26, 2013
by
Adam Palay
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
strip processed fields in instructor dash
parent
2c0a08f7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
15 deletions
+33
-15
lms/djangoapps/instructor/views/api.py
+14
-9
lms/djangoapps/instructor/views/legacy.py
+19
-6
No files found.
lms/djangoapps/instructor/views/api.py
View file @
640d00c5
...
...
@@ -233,7 +233,7 @@ def modify_access(request, course_id):
request
.
user
,
course_id
,
'instructor'
,
depth
=
None
)
email
=
request
.
GET
.
get
(
'email'
)
email
=
_clean_field
(
request
.
GET
.
get
(
'email'
)
)
rolename
=
request
.
GET
.
get
(
'rolename'
)
action
=
request
.
GET
.
get
(
'action'
)
...
...
@@ -433,7 +433,7 @@ def get_student_progress_url(request, course_id):
'progress_url': '/../...'
}
"""
student_email
=
request
.
GET
.
get
(
'student_email'
)
student_email
=
_clean_field
(
request
.
GET
.
get
(
'student_email'
)
)
user
=
User
.
objects
.
get
(
email
=
student_email
)
progress_url
=
reverse
(
'student_progress'
,
kwargs
=
{
'course_id'
:
course_id
,
'student_id'
:
user
.
id
})
...
...
@@ -474,8 +474,8 @@ def reset_student_attempts(request, course_id):
request
.
user
,
course_id
,
'staff'
,
depth
=
None
)
problem_to_reset
=
request
.
GET
.
get
(
'problem_to_reset'
)
student_email
=
request
.
GET
.
get
(
'student_email'
)
problem_to_reset
=
_clean_field
(
request
.
GET
.
get
(
'problem_to_reset'
)
)
student_email
=
_clean_field
(
request
.
GET
.
get
(
'student_email'
)
)
all_students
=
request
.
GET
.
get
(
'all_students'
,
False
)
in
[
'true'
,
'True'
,
True
]
delete_module
=
request
.
GET
.
get
(
'delete_module'
,
False
)
in
[
'true'
,
'True'
,
True
]
...
...
@@ -531,8 +531,8 @@ def rescore_problem(request, course_id):
all_students and student_email cannot both be present.
"""
problem_to_reset
=
request
.
GET
.
get
(
'problem_to_reset'
)
student_email
=
request
.
GET
.
get
(
'student_email'
,
False
)
problem_to_reset
=
_clean_field
(
request
.
GET
.
get
(
'problem_to_reset'
)
)
student_email
=
_clean_field
(
request
.
GET
.
get
(
'student_email'
,
False
)
)
all_students
=
request
.
GET
.
get
(
'all_students'
)
in
[
'true'
,
'True'
,
True
]
if
not
(
problem_to_reset
and
(
all_students
or
student_email
)):
...
...
@@ -576,8 +576,8 @@ def list_instructor_tasks(request, course_id):
- `problem_urlname` and `student_email` lists task
history for problem AND student (intersection)
"""
problem_urlname
=
request
.
GET
.
get
(
'problem_urlname'
,
False
)
student_email
=
request
.
GET
.
get
(
'student_email'
,
False
)
problem_urlname
=
_clean_field
(
request
.
GET
.
get
(
'problem_urlname'
,
False
)
)
student_email
=
_clean_field
(
request
.
GET
.
get
(
'student_email'
,
False
)
)
if
student_email
and
not
problem_urlname
:
return
HttpResponseBadRequest
(
...
...
@@ -693,7 +693,7 @@ def update_forum_role_membership(request, course_id):
request
.
user
,
course_id
,
FORUM_ROLE_ADMINISTRATOR
)
email
=
request
.
GET
.
get
(
'email'
)
email
=
_clean_field
(
request
.
GET
.
get
(
'email'
)
)
rolename
=
request
.
GET
.
get
(
'rolename'
)
action
=
request
.
GET
.
get
(
'action'
)
...
...
@@ -815,3 +815,8 @@ def _msk_from_problem_urlname(course_id, urlname):
(
org
,
course_name
,
__
)
=
course_id
.
split
(
"/"
)
module_state_key
=
"i4x://"
+
org
+
"/"
+
course_name
+
"/"
+
urlname
return
module_state_key
def
_clean_field
(
field
):
if
field
:
return
field
.
strip
()
return
field
lms/djangoapps/instructor/views/legacy.py
View file @
640d00c5
...
...
@@ -171,6 +171,9 @@ def instructor_dashboard(request, course_id):
Form is either urlname or modulename/urlname. If no modulename
is provided, "problem" is assumed.
"""
# remove whitespace
urlname
=
_clean_field
(
urlname
)
# tolerate an XML suffix in the urlname
if
urlname
[
-
4
:]
==
".xml"
:
urlname
=
urlname
[:
-
4
]
...
...
@@ -185,6 +188,7 @@ def instructor_dashboard(request, course_id):
def
get_student_from_identifier
(
unique_student_identifier
):
"""Gets a student object using either an email address or username"""
unique_student_identifier
=
_clean_field
(
unique_student_identifier
)
msg
=
""
try
:
if
"@"
in
unique_student_identifier
:
...
...
@@ -706,12 +710,14 @@ def instructor_dashboard(request, course_id):
html_message
=
request
.
POST
.
get
(
"message"
)
text_message
=
html_to_text
(
html_message
)
email
=
CourseEmail
(
course_id
=
course_id
,
sender
=
request
.
user
,
to_option
=
email_to_option
,
subject
=
email_subject
,
html_message
=
html_message
,
text_message
=
text_message
)
email
=
CourseEmail
(
course_id
=
course_id
,
sender
=
request
.
user
,
to_option
=
email_to_option
,
subject
=
email_subject
,
html_message
=
html_message
,
text_message
=
text_message
)
email
.
save
()
...
...
@@ -994,6 +1000,7 @@ def _add_or_remove_user_group(request, username_or_email, group, group_title, ev
to do.
"""
user
=
None
username_or_email
=
_clean_field
(
username_or_email
)
try
:
if
'@'
in
username_or_email
:
user
=
User
.
objects
.
get
(
email
=
username_or_email
)
...
...
@@ -1561,3 +1568,9 @@ def get_background_task_table(course_id, problem_url, student=None):
datatable
[
'title'
]
=
"{course_id} > {location}"
.
format
(
course_id
=
course_id
,
location
=
problem_url
)
return
msg
,
datatable
def
_clean_field
(
field
):
if
field
:
return
field
.
strip
()
return
field
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