openstack/deb-python-django-compressor
Code Issues Proposed changes

Avoid overwriting context variables needed for compressor to work.

Browse Source
This commit is contained in:
shemigon
2011-09-16 13:45:10 +07:00
committed by Jannis Leidel
parent 22f6245d1c
commit 5c738bedfa
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compressor/base.py
View File

@@ -258,8 +258,8 @@ class Compressor(object):
if context is None: if context is None:
context = {} context = {}
final_context = Context() final_context = Context()
final_context.update(context)
final_context.update(self.context) final_context.update(self.context)
final_context.update(context)
final_context.update(self.extra_context) final_context.update(self.extra_context)
post_compress.send(sender='django-compressor', type=self.type, mode=mode, context=final_context) post_compress.send(sender='django-compressor', type=self.type, mode=mode, context=final_context)
return render_to_string("compressor/%s_%s.html" % return render_to_string("compressor/%s_%s.html" %

10
tests/tests/base.py
View File

@@ -96,6 +96,16 @@ class CompressorTestCase(TestCase):
out = u'<script type="text/javascript" src="/media/CACHE/js/066cd253eada.js"></script>' out = u'<script type="text/javascript" src="/media/CACHE/js/066cd253eada.js"></script>'
self.assertEqual(out, self.js_node.output()) self.assertEqual(out, self.js_node.output())
def test_js_override_url(self):
self.js_node.context.update({'url': u'This is not a url, just a text'})
out = u'<script type="text/javascript" src="/media/CACHE/js/066cd253eada.js"></script>'
self.assertEqual(out, self.js_node.output())
def test_css_override_url(self):
self.css_node.context.update({'url': u'This is not a url, just a text'})
output = css_tag('/media/CACHE/css/e41ba2cc6982.css')
self.assertEqual(output, self.css_node.output().strip())
def test_js_return_if_off(self): def test_js_return_if_off(self):
try: try:
enabled = settings.COMPRESS_ENABLED enabled = settings.COMPRESS_ENABLED