From 826d5fe3dae797b5f5940a971f74e185179508e6 Mon Sep 17 00:00:00 2001 From: Dillon Dumesnil Date: Wed, 27 May 2020 09:23:55 -0700 Subject: [PATCH] AA-167: Making the LTI icon class dynamic We will now show the problem icon if the LTI problem is scored and 'other' if it is not. --- common/lib/xmodule/xmodule/lti_module.py | 7 ++++++- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/github.in | 2 +- requirements/edx/testing.txt | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/common/lib/xmodule/xmodule/lti_module.py b/common/lib/xmodule/xmodule/lti_module.py index fc7a306bd4..39a85d0ed4 100644 --- a/common/lib/xmodule/xmodule/lti_module.py +++ b/common/lib/xmodule/xmodule/lti_module.py @@ -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. diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 250ef39f9a..96af3fb6f6 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -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 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 70ddd23c39..71eca4509f 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -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 diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 192dc084cb..b0ab3a32ed 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -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 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 69c645e24e..d8a3d3390e 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -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