From e88a65660f8d114b8c5e8670f228af7f4bdd81a0 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Fri, 2 Mar 2012 11:29:14 +0000 Subject: [PATCH] Fixed #17806 -- Fixed off-by-n error in the CachedStaticFilesStorage that prevented it from finding files in nested directories. Many thanks to lpetre. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17622 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/staticfiles/storage.py | 2 +- .../staticfiles_tests/project/documents/cached/absolute.css | 3 +++ tests/regressiontests/staticfiles_tests/tests.py | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/django/contrib/staticfiles/storage.py b/django/contrib/staticfiles/storage.py index ac83f522ee..fe35a3163e 100644 --- a/django/contrib/staticfiles/storage.py +++ b/django/contrib/staticfiles/storage.py @@ -160,7 +160,7 @@ class CachedFilesMixin(object): if sub_level: if sub_level == 1: parent_level -= 1 - start, end = parent_level, sub_level - 1 + start, end = parent_level, 1 else: start, end = 1, sub_level - 1 joined_result = '/'.join(name_parts[:-start] + url_parts[end:]) diff --git a/tests/regressiontests/staticfiles_tests/project/documents/cached/absolute.css b/tests/regressiontests/staticfiles_tests/project/documents/cached/absolute.css index e64e7ccca7..54467a362d 100644 --- a/tests/regressiontests/staticfiles_tests/project/documents/cached/absolute.css +++ b/tests/regressiontests/staticfiles_tests/project/documents/cached/absolute.css @@ -1 +1,4 @@ @import url("/static/cached/styles.css"); +body { + background: #d3d6d8 url(/static/cached/img/relative.png); +} \ No newline at end of file diff --git a/tests/regressiontests/staticfiles_tests/tests.py b/tests/regressiontests/staticfiles_tests/tests.py index 5c8748ef2c..050ba0e9e9 100644 --- a/tests/regressiontests/staticfiles_tests/tests.py +++ b/tests/regressiontests/staticfiles_tests/tests.py @@ -416,11 +416,12 @@ class TestCollectionCachedStorage(BaseCollectionTestCase, def test_template_tag_absolute(self): relpath = self.cached_file_path("cached/absolute.css") - self.assertEqual(relpath, "cached/absolute.cc80cb5e2eb1.css") + self.assertEqual(relpath, "cached/absolute.23f087ad823a.css") with storage.staticfiles_storage.open(relpath) as relfile: content = relfile.read() self.assertNotIn("/static/cached/styles.css", content) self.assertIn("/static/cached/styles.93b1147e8552.css", content) + self.assertIn('/static/cached/img/relative.acae32e4532b.png', content) def test_template_tag_denorm(self): relpath = self.cached_file_path("cached/denorm.css")