Skip to content
Snippets Groups Projects
Commit 95358c63 authored by Douglas Hall's avatar Douglas Hall
Browse files

Merge pull request #19 from haikuginger/presentation-locale

Fixing launch_presentation_locale (promise!); updating to v1.0.9
parents 7d7d0448 ea9da5aa
No related branches found
No related tags found
No related merge requests found
......@@ -152,7 +152,12 @@ class LtiConsumer(object):
real_user_object = self.xblock.runtime.get_real_user(self.xblock.runtime.anonymous_student_id)
self.xblock.user_email = getattr(real_user_object, "email", "")
self.xblock.user_username = getattr(real_user_object, "username", "")
self.xblock.user_language = getattr(getattr(real_user_object, "profile", ""), "language", "")
user_preferences = getattr(real_user_object, "preferences", None)
if user_preferences is not None:
language_preference = user_preferences.filter(key='pref-lang')
if len(language_preference) == 1:
self.xblock.user_language = language_preference[0].value
if self.xblock.ask_to_send_username and self.xblock.user_username:
lti_parameters["lis_person_sourcedid"] = self.xblock.user_username
......
......@@ -181,11 +181,10 @@ class TestLtiConsumer(TestLtiConsumerXBlock):
self.lti_consumer.xblock.has_score = True
self.lti_consumer.xblock.ask_to_send_username = True
self.lti_consumer.xblock.ask_to_send_email = True
self.lti_consumer.xblock.runtime.get_real_user.return_value = Mock(
email='edx@example.com',
username='edx',
profile=Mock(language='en')
preferences=Mock(filter=Mock(return_value=[Mock(value='en')]))
)
self.assertEqual(self.lti_consumer.get_signed_lti_parameters(), expected_lti_parameters)
......
......@@ -22,7 +22,7 @@ def package_data(pkg, roots):
setup(
name='lti_consumer-xblock',
version='1.0.7',
version='1.0.9',
description='This XBlock implements the consumer side of the LTI specification.',
packages=[
'lti_consumer',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment