From 7148af88df594c009faa37c80fdb2bc33effc1d8 Mon Sep 17 00:00:00 2001 From: Lazybird Date: Mon, 23 Feb 2015 17:17:19 +0100 Subject: [PATCH] Fixed an import issue with django settings - in xblock authoring module. Now importing settings module from 'django.conf' instead of 'cms.envs.common'. --- cms/lib/xblock/authoring_mixin.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cms/lib/xblock/authoring_mixin.py b/cms/lib/xblock/authoring_mixin.py index a4bbf472e8..3eb27c6f57 100644 --- a/cms/lib/xblock/authoring_mixin.py +++ b/cms/lib/xblock/authoring_mixin.py @@ -4,6 +4,8 @@ Mixin class that provides authoring capabilities for XBlocks. import logging +from django.conf import settings + from xblock.core import XBlock from xblock.fields import XBlockMixin from xblock.fragment import Fragment @@ -26,9 +28,7 @@ class AuthoringMixin(XBlockMixin): """ Returns the Studio URL to a static resource. """ - # TODO: is there a cleaner way to do this? - from cms.envs.common import STATIC_URL - return STATIC_URL + relative_url + return settings.STATIC_URL + relative_url def visibility_view(self, _context=None): """