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
a609e074
Commit
a609e074
authored
Dec 08, 2015
by
Peter Fogg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Unicode errors in financial assistance.
parent
bce1c66b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
common/djangoapps/util/views.py
+2
-2
lms/djangoapps/courseware/tests/test_views.py
+3
-3
lms/djangoapps/courseware/views.py
+5
-5
No files found.
common/djangoapps/util/views.py
View file @
a609e074
...
...
@@ -205,8 +205,8 @@ def _record_feedback_in_zendesk(
zendesk_api
=
_ZendeskApi
()
additional_info_string
=
(
"Additional information:
\n\n
"
+
"
\n
"
.
join
(
"
%
s:
%
s"
%
(
key
,
value
)
for
(
key
,
value
)
in
additional_info
.
items
()
if
value
is
not
None
)
u
"Additional information:
\n\n
"
+
u"
\n
"
.
join
(
u
"
%
s:
%
s"
%
(
key
,
value
)
for
(
key
,
value
)
in
additional_info
.
items
()
if
value
is
not
None
)
)
# Tag all issues with LMS to distinguish channel in Zendesk; requested by student support team
...
...
lms/djangoapps/courseware/tests/test_views.py
View file @
a609e074
...
...
@@ -184,7 +184,7 @@ class ViewsTestCase(ModuleStoreTestCase):
"""
def
setUp
(
self
):
super
(
ViewsTestCase
,
self
)
.
setUp
()
self
.
course
=
CourseFactory
.
create
()
self
.
course
=
CourseFactory
.
create
(
display_name
=
u'teꜱᴛ course'
)
self
.
chapter
=
ItemFactory
.
create
(
category
=
'chapter'
,
parent_location
=
self
.
course
.
location
)
self
.
section
=
ItemFactory
.
create
(
category
=
'sequential'
,
parent_location
=
self
.
chapter
.
location
,
due
=
datetime
(
2013
,
9
,
18
,
11
,
30
,
00
))
self
.
vertical
=
ItemFactory
.
create
(
category
=
'vertical'
,
parent_location
=
self
.
section
.
location
)
...
...
@@ -434,7 +434,7 @@ class ViewsTestCase(ModuleStoreTestCase):
'location'
:
unicode
(
usage_key
),
})
response
=
self
.
client
.
get
(
url
)
response_content
=
HTMLParser
()
.
unescape
(
response
.
content
)
response_content
=
HTMLParser
()
.
unescape
(
response
.
content
.
decode
(
'utf-8'
)
)
# We have update the state 4 times: twice to change content, and twice
# to set the scores. We'll check that the identifying content from each is
...
...
@@ -547,7 +547,7 @@ class ViewsTestCase(ModuleStoreTestCase):
self
.
assertEqual
(
ticket_subject
,
'Financial assistance request for learner {username} in course {course}'
.
format
(
u
'Financial assistance request for learner {username} in course {course}'
.
format
(
username
=
username
,
course
=
self
.
course
.
display_name
)
...
...
lms/djangoapps/courseware/views.py
View file @
a609e074
...
...
@@ -1477,22 +1477,22 @@ def financial_assistance_request(request):
ip_address
=
get_ip
(
request
)
except
ValueError
:
# Thrown if JSON parsing fails
return
HttpResponseBadRequest
(
'Could not parse request JSON.'
)
return
HttpResponseBadRequest
(
u
'Could not parse request JSON.'
)
except
InvalidKeyError
:
# Thrown if course key parsing fails
return
HttpResponseBadRequest
(
'Could not parse request course key.'
)
return
HttpResponseBadRequest
(
u
'Could not parse request course key.'
)
except
KeyError
as
err
:
# Thrown if fields are missing
return
HttpResponseBadRequest
(
'The field {} is required.'
.
format
(
err
.
message
))
return
HttpResponseBadRequest
(
u
'The field {} is required.'
.
format
(
err
.
message
))
zendesk_submitted
=
_record_feedback_in_zendesk
(
legal_name
,
email
,
'Financial assistance request for learner {username} in course {course_name}'
.
format
(
u
'Financial assistance request for learner {username} in course {course_name}'
.
format
(
username
=
username
,
course_name
=
course
.
display_name
),
'Financial Assistance Request'
,
u
'Financial Assistance Request'
,
{
'course_id'
:
course_id
},
# Send the application as additional info on the ticket so
# that it is not shown when support replies. This uses
...
...
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