Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #24069 from edx/ddumesnil/fix-lti-icon-AA-167

Browse Source 
AA-167: Making the LTI icon class dynamic
This commit is contained in:
Dillon Dumesnil
2020-05-28 08:19:40 -07:00
committed by GitHub
parent 902f8646ea 826d5fe3da
commit 3d69046147
5 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/lib/xmodule/xmodule/lti_module.py
View File

@@ -346,7 +346,6 @@ class LTIModule(LTIFields, LTI20ModuleMixin, XModule):
}
css = {'scss': [resource_string(__name__, 'css/lti/lti.scss')]}
js_module_name = 'LTI'
icon_class = 'problem'
def get_input_fields(self):
# LTI provides a list of default parameters that might be passed as
@@ -558,6 +557,12 @@ class LTIModule(LTIFields, LTI20ModuleMixin, XModule):
}
return roles.get(self.system.get_user_role(), u'Student')
def get_icon_class(self):
""" Returns the icon class """
if self.graded and self.has_score: # pylint: disable=no-member
return 'problem'
return 'other'
def oauth_params(self, custom_parameters, client_key, client_secret):
"""
Signs request and returns signature and OAuth parameters.

2
requirements/edx/base.txt
View File

@@ -148,7 +148,7 @@ lazy==1.4 # via -r requirements/edx/paver.txt, acid-xblock, ora2
lepl==5.1.3 # via rfc6266-parser
libsass==0.10.0 # via -r requirements/edx/paver.txt, ora2
loremipsum==1.0.5 # via ora2
git+https://github.com/edx/xblock-lti-consumer.git@v1.2.6#egg=lti_consumer-xblock==1.2.6 # via -r requirements/edx/github.in
git+https://github.com/edx/xblock-lti-consumer.git@v1.3.1#egg=lti_consumer-xblock==1.3.1 # via -r requirements/edx/github.in
lxml==4.5.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/../edx-sandbox/shared.txt, capa, edxval, lti-consumer-xblock, ora2, safe-lxml, xblock, xmlsec
mailsnake==1.6.4 # via -r requirements/edx/base.in
mako==1.0.2 # via -r requirements/edx/base.in, acid-xblock, lti-consumer-xblock, xblock-google-drive, xblock-utils

2
requirements/edx/development.txt
View File

@@ -177,7 +177,7 @@ lazy==1.4 # via -r requirements/edx/testing.txt, acid-xblock, bo
lepl==5.1.3 # via -r requirements/edx/testing.txt, rfc6266-parser
libsass==0.10.0 # via -r requirements/edx/testing.txt, ora2
loremipsum==1.0.5 # via -r requirements/edx/testing.txt, ora2
git+https://github.com/edx/xblock-lti-consumer.git@v1.2.6#egg=lti_consumer-xblock==1.2.6 # via -r requirements/edx/testing.txt
git+https://github.com/edx/xblock-lti-consumer.git@v1.3.1#egg=lti_consumer-xblock==1.3.1 # via -r requirements/edx/testing.txt
lxml==4.5.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, capa, edxval, lti-consumer-xblock, ora2, pyquery, safe-lxml, xblock, xmlsec
m2r==0.2.1 # via sphinxcontrib-openapi
mailsnake==1.6.4 # via -r requirements/edx/testing.txt

2
requirements/edx/github.in
View File

@@ -91,7 +91,7 @@ git+https://github.com/edx/crowdsourcehinter.git@2178ac72891392106ffef389651aef3
-e git+https://github.com/edx/RateXBlock.git@2.0#egg=rate-xblock
-e git+https://github.com/edx/DoneXBlock.git@2.0.2#egg=done-xblock
-e git+https://github.com/edx-solutions/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive
git+https://github.com/edx/xblock-lti-consumer.git@v1.2.6#egg=lti_consumer-xblock==1.2.6
git+https://github.com/edx/xblock-lti-consumer.git@v1.3.1#egg=lti_consumer-xblock==1.3.1
# Third Party XBlocks

2
requirements/edx/testing.txt
View File

@@ -171,7 +171,7 @@ lazy==1.4 # via -r requirements/edx/base.txt, acid-xblock, bok-c
lepl==5.1.3 # via -r requirements/edx/base.txt, rfc6266-parser
libsass==0.10.0 # via -r requirements/edx/base.txt, ora2
loremipsum==1.0.5 # via -r requirements/edx/base.txt, ora2
git+https://github.com/edx/xblock-lti-consumer.git@v1.2.6#egg=lti_consumer-xblock==1.2.6 # via -r requirements/edx/base.txt
git+https://github.com/edx/xblock-lti-consumer.git@v1.3.1#egg=lti_consumer-xblock==1.3.1 # via -r requirements/edx/base.txt
lxml==4.5.0 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, capa, edxval, lti-consumer-xblock, ora2, pyquery, safe-lxml, xblock, xmlsec
mailsnake==1.6.4 # via -r requirements/edx/base.txt
mako==1.0.2 # via -r requirements/edx/base.txt, acid-xblock, lti-consumer-xblock, xblock-google-drive, xblock-utils