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
fbc8a134
Commit
fbc8a134
authored
Nov 02, 2015
by
Zia Fazal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
convert string to bytestring before passing it to urllib.quote_plus
further improvement in handling of unicode data
parent
cd3f8ded
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
52 additions
and
7 deletions
+52
-7
lms/djangoapps/certificates/tests/test_webview_views.py
+36
-0
lms/djangoapps/certificates/views/webview.py
+16
-7
No files found.
lms/djangoapps/certificates/tests/test_webview_views.py
View file @
fbc8a134
# -*- coding: utf-8 -*-
"""Tests for certificates views. """
"""Tests for certificates views. """
import
json
import
json
import
ddt
from
uuid
import
uuid4
from
uuid
import
uuid4
from
nose.plugins.attrib
import
attr
from
nose.plugins.attrib
import
attr
from
mock
import
patch
from
mock
import
patch
...
@@ -48,6 +50,7 @@ FEATURES_WITH_CUSTOM_CERTS_ENABLED.update(FEATURES_WITH_CERTS_ENABLED)
...
@@ -48,6 +50,7 @@ FEATURES_WITH_CUSTOM_CERTS_ENABLED.update(FEATURES_WITH_CERTS_ENABLED)
@attr
(
'shard_1'
)
@attr
(
'shard_1'
)
@ddt.ddt
class
CertificatesViewsTests
(
ModuleStoreTestCase
,
EventTrackingTestCase
):
class
CertificatesViewsTests
(
ModuleStoreTestCase
,
EventTrackingTestCase
):
"""
"""
Tests for the certificates web/html views
Tests for the certificates web/html views
...
@@ -133,6 +136,7 @@ class CertificatesViewsTests(ModuleStoreTestCase, EventTrackingTestCase):
...
@@ -133,6 +136,7 @@ class CertificatesViewsTests(ModuleStoreTestCase, EventTrackingTestCase):
course name: ${accomplishment_copy_course_name}
course name: ${accomplishment_copy_course_name}
mode: ${course_mode}
mode: ${course_mode}
${accomplishment_copy_course_description}
${accomplishment_copy_course_description}
${twitter_url}
</body>
</body>
</html>
</html>
"""
"""
...
@@ -615,3 +619,35 @@ class CertificatesViewsTests(ModuleStoreTestCase, EventTrackingTestCase):
...
@@ -615,3 +619,35 @@ class CertificatesViewsTests(ModuleStoreTestCase, EventTrackingTestCase):
response
=
self
.
client
.
get
(
test_url
)
response
=
self
.
client
.
get
(
test_url
)
self
.
assertEqual
(
response
.
status_code
,
200
)
self
.
assertEqual
(
response
.
status_code
,
200
)
self
.
assertContains
(
response
,
'mode: {}'
.
format
(
mode
))
self
.
assertContains
(
response
,
'mode: {}'
.
format
(
mode
))
@ddt.data
(
True
,
False
)
def
test_certificate_custom_template_with_unicode_data
(
self
,
custom_certs_enabled
):
"""
Tests custom template renders properly with unicode data.
"""
mode
=
'honor'
self
.
_add_course_certificates
(
count
=
1
,
signatory_count
=
2
)
self
.
_create_custom_template
(
mode
=
mode
)
with
patch
.
dict
(
"django.conf.settings.FEATURES"
,
{
"CERTIFICATES_HTML_VIEW"
:
True
,
"CUSTOM_CERTIFICATE_TEMPLATES_ENABLED"
:
custom_certs_enabled
}):
test_url
=
get_certificate_url
(
user_id
=
self
.
user
.
id
,
course_id
=
unicode
(
self
.
course
.
id
)
)
with
patch
.
dict
(
"django.conf.settings.SOCIAL_SHARING_SETTINGS"
,
{
"CERTIFICATE_TWITTER"
:
True
,
"CERTIFICATE_TWITTER_TEXT"
:
u"nền tảng học tập"
}):
with
patch
(
'django.http.HttpRequest.build_absolute_uri'
)
as
mock_abs_uri
:
mock_abs_uri
.
return_value
=
'='
.
join
([
'http://localhost/?param'
,
u'é'
])
with
patch
(
'certificates.api.get_course_organizations'
)
as
mock_get_orgs
:
mock_get_orgs
.
return_value
=
[]
response
=
self
.
client
.
get
(
test_url
)
self
.
assertEqual
(
response
.
status_code
,
200
)
if
custom_certs_enabled
:
self
.
assertContains
(
response
,
'mode: {}'
.
format
(
mode
))
else
:
self
.
assertContains
(
response
,
"Tweet this Accomplishment"
)
self
.
assertContains
(
response
,
'https://twitter.com/intent/tweet'
)
lms/djangoapps/certificates/views/webview.py
View file @
fbc8a134
...
@@ -11,6 +11,7 @@ from django.contrib.auth.models import User
...
@@ -11,6 +11,7 @@ from django.contrib.auth.models import User
from
django.http
import
HttpResponse
from
django.http
import
HttpResponse
from
django.template
import
RequestContext
from
django.template
import
RequestContext
from
django.utils.translation
import
ugettext
as
_
from
django.utils.translation
import
ugettext
as
_
from
django.utils.encoding
import
smart_str
from
django.core.urlresolvers
import
reverse
from
django.core.urlresolvers
import
reverse
from
courseware.courses
import
course_image_url
from
courseware.courses
import
course_image_url
...
@@ -416,10 +417,12 @@ def render_html_view(request, user_id, course_id):
...
@@ -416,10 +417,12 @@ def render_html_view(request, user_id, course_id):
)
)
)
)
context
[
'share_url'
]
=
share_url
context
[
'share_url'
]
=
share_url
twitter_url
=
'https://twitter.com/intent/tweet?text={twitter_share_text}&url={share_url}'
.
format
(
twitter_url
=
''
twitter_share_text
=
context
[
'twitter_share_text'
],
if
context
.
get
(
'twitter_share_enabled'
,
False
):
share_url
=
urllib
.
quote_plus
(
share_url
)
twitter_url
=
'https://twitter.com/intent/tweet?text={twitter_share_text}&url={share_url}'
.
format
(
)
twitter_share_text
=
smart_str
(
context
[
'twitter_share_text'
]),
share_url
=
urllib
.
quote_plus
(
smart_str
(
share_url
))
)
context
[
'twitter_url'
]
=
twitter_url
context
[
'twitter_url'
]
=
twitter_url
context
[
'full_course_image_url'
]
=
request
.
build_absolute_uri
(
course_image_url
(
course
))
context
[
'full_course_image_url'
]
=
request
.
build_absolute_uri
(
course_image_url
(
course
))
...
@@ -432,10 +435,10 @@ def render_html_view(request, user_id, course_id):
...
@@ -432,10 +435,10 @@ def render_html_view(request, user_id, course_id):
course
.
id
,
course
.
id
,
course
.
display_name
,
course
.
display_name
,
user_certificate
.
mode
,
user_certificate
.
mode
,
request
.
build_absolute_uri
(
get_certificate_url
(
smart_str
(
request
.
build_absolute_uri
(
get_certificate_url
(
user_id
=
user
.
id
,
user_id
=
user
.
id
,
course_id
=
unicode
(
course
.
id
)
course_id
=
unicode
(
course
.
id
)
))
))
)
)
)
else
:
else
:
context
[
'linked_in_url'
]
=
None
context
[
'linked_in_url'
]
=
None
...
@@ -471,7 +474,13 @@ def render_html_view(request, user_id, course_id):
...
@@ -471,7 +474,13 @@ def render_html_view(request, user_id, course_id):
if
settings
.
FEATURES
.
get
(
'CUSTOM_CERTIFICATE_TEMPLATES_ENABLED'
,
False
):
if
settings
.
FEATURES
.
get
(
'CUSTOM_CERTIFICATE_TEMPLATES_ENABLED'
,
False
):
custom_template
=
get_certificate_template
(
course_key
,
user_certificate
.
mode
)
custom_template
=
get_certificate_template
(
course_key
,
user_certificate
.
mode
)
if
custom_template
:
if
custom_template
:
template
=
Template
(
custom_template
)
template
=
Template
(
custom_template
,
output_encoding
=
'utf-8'
,
input_encoding
=
'utf-8'
,
default_filters
=
[
'decode.utf8'
],
encoding_errors
=
'replace'
,
)
context
=
RequestContext
(
request
,
context
)
context
=
RequestContext
(
request
,
context
)
return
HttpResponse
(
template
.
render
(
context
))
return
HttpResponse
(
template
.
render
(
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