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
2d05ffac
Commit
2d05ffac
authored
Sep 16, 2014
by
Ned Batchelder
Committed by
John Eskew
Sep 17, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "username and email request for lti module"
This reverts commit
3f159ea5
.
parent
d1d3a69e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 additions
and
65 deletions
+1
-65
common/lib/xmodule/xmodule/css/lti/lti.scss
+0
-4
common/lib/xmodule/xmodule/lti_module.py
+0
-54
lms/djangoapps/courseware/tests/test_lti_integration.py
+0
-3
lms/templates/lti.html
+1
-4
No files found.
common/lib/xmodule/xmodule/css/lti/lti.scss
View file @
2d05ffac
...
...
@@ -32,10 +32,6 @@ div.lti {
}
}
div
.ltiTextBox
{
width
:
280px
;
}
form
.ltiLaunchForm
{
display
:
none
;
}
...
...
common/lib/xmodule/xmodule/lti_module.py
View file @
2d05ffac
...
...
@@ -191,35 +191,6 @@ class LTIFields(object):
default
=
False
,
scope
=
Scope
.
settings
)
"""
Users will be presented with a message indicating that their e-mail/username would be sent to a third
party application. When "Open in new Page" is not selected, the tool automatically appears without any user action.
"""
request_username
=
Boolean
(
display_name
=
_
(
"Request user's username"
),
help
=
_
(
"Requesting user's username will only work if 'Open in a new page' is set to True"
),
default
=
False
,
scope
=
Scope
.
settings
)
request_email
=
Boolean
(
display_name
=
_
(
"Request user's email"
),
help
=
_
(
"Requesting user's email will only work if 'Open in a new page' is set to True"
),
default
=
False
,
scope
=
Scope
.
settings
)
text_box
=
String
(
display_name
=
_
(
"LTI Application Information"
),
help
=
_
(
"Provide a description of the third party application. If requesting username and/or email, use this text box to inform users "
"that their username and/or email will be forwarded to a third party application."
),
default
=
""
,
scope
=
Scope
.
settings
)
class
LTIModule
(
LTIFields
,
LTI20ModuleMixin
,
XModule
):
...
...
@@ -346,7 +317,6 @@ class LTIModule(LTIFields, LTI20ModuleMixin, XModule):
# parsing custom parameters to dict
custom_parameters
=
{}
for
custom_parameter
in
self
.
custom_parameters
:
try
:
param_name
,
param_value
=
[
p
.
strip
()
for
p
in
custom_parameter
.
split
(
'='
,
1
)]
...
...
@@ -400,10 +370,6 @@ class LTIModule(LTIFields, LTI20ModuleMixin, XModule):
'weight'
:
self
.
weight
,
'module_score'
:
self
.
module_score
,
'comment'
:
sanitized_comment
,
'text_box'
:
self
.
text_box
,
'request_username'
:
self
.
request_username
,
'request_email'
:
self
.
request_email
,
}
def
get_html
(
self
):
...
...
@@ -550,26 +516,6 @@ class LTIModule(LTIFields, LTI20ModuleMixin, XModule):
u'lis_outcome_service_url'
:
self
.
get_outcome_service_url
()
})
self
.
user_email
=
""
self
.
user_username
=
""
# Username and email can't be sent in studio mode, because the user object is not defined.
# To test functionality test in LMS
if
self
.
runtime
.
get_real_user
is
not
None
:
real_user_object
=
self
.
runtime
.
get_real_user
(
self
.
runtime
.
anonymous_student_id
)
self
.
user_email
=
real_user_object
.
email
self
.
user_username
=
real_user_object
.
username
if
self
.
request_username
and
self
.
user_username
and
self
.
open_in_a_new_page
:
body
.
update
({
u'lis_person_sourcedid'
:
self
.
user_username
})
if
self
.
request_email
and
self
.
user_email
and
self
.
open_in_a_new_page
:
body
.
update
({
u'lis_person_contact_email_primary'
:
self
.
user_email
})
# Appending custom parameter for signing.
body
.
update
(
custom_parameters
)
...
...
lms/djangoapps/courseware/tests/test_lti_integration.py
View file @
2d05ffac
...
...
@@ -89,9 +89,6 @@ class TestLTI(BaseTestXmodule):
'module_score'
:
None
,
'comment'
:
u''
,
'weight'
:
1.0
,
'request_username'
:
self
.
item_descriptor
.
request_username
,
'request_email'
:
self
.
item_descriptor
.
request_email
,
'text_box'
:
self
.
item_descriptor
.
text_box
,
}
def
mocked_sign
(
self
,
*
args
,
**
kwargs
):
...
...
lms/templates/lti.html
View file @
2d05ffac
...
...
@@ -26,9 +26,6 @@
% if launch_url and launch_url != 'http://www.example.com' and not hide_launch:
% if open_in_a_new_page:
<div
class=
"wrapper-lti-link"
>
<div
class=
"ltiTextBox"
>
<span>
${text_box}
</span>
</div>
<p
class=
"lti-link external"
><a
target=
"_blank"
class=
"link_lti_new_window"
href=
"${form_url}"
>
${_('View resource in a new window')}
<i
class=
"icon-external-link"
></i>
...
...
@@ -46,7 +43,7 @@
<h3
class=
"error_message"
>
${_('Please provide launch_url. Click "Edit", and fill in the required fields.')}
</h3>
%
endif
%endif
% if has_score and comment:
<h4
class=
"problem-feedback-label"
>
${_("Feedback on your work from the grader:")}
</h4>
...
...
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