Commit 3ac823fc authored by Pablo Martín's avatar Pablo Martín Committed by Claude Paroz
Browse files

Fixed #21460 -- Reenabled proper template precedence in find_template 

Refs #20806. Thanks Unai Zalakain for the review.
parent d6cc37d6

AUTHORS

+1 −0
Original line number Diff line number Diff line
@@ -420,6 +420,7 @@ answer newbie questions, and generally made Django that much better: 
    mark@junklight.com

    Orestis Markou <orestis@orestis.gr>

    Andrés Torres Marroquín <andres.torres.marroquin@gmail.com>

    Pablo Martín <goinnn@gmail.com>

    Takashi Matsuo <matsuo.takashi@gmail.com>

    Zlatko Mašek <zlatko.masek@gmail.com>

    Yasushi Masuda <whosaysni@gmail.com>

django/template/loaders/cached.py

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ class Loader(BaseLoader): 
                    pass

                else:

                    result = (template, make_origin(display_name, loader, name, dirs))

                    break

        self.find_template_cache[key] = result

        if result:

            return result

tests/template_tests/templates/priority/foo.html

0 → 100644
+1 −0
Original line number Diff line number Diff line 
no priority

tests/template_tests/test_loaders.py

+30 −0
Original line number Diff line number Diff line
@@ -189,3 +189,33 @@ class TemplateDirsOverrideTest(unittest.TestCase): 
        for dirs in self.dirs_iter:

            template = loader.select_template(['test_dirs.html'], dirs=dirs)

            self.assertEqual(template.render(Context({})), 'spam eggs\n')





@override_settings(

    TEMPLATE_LOADERS=(

        ('django.template.loaders.cached.Loader', (

            'django.template.loaders.filesystem.Loader',

            'django.template.loaders.app_directories.Loader',

        )),

    )

)

class PriorityCacheLoader(TestCase):

    def test_basic(self):

        """

        Check that the order of template loader works. Refs #21460.

        """

        t1, name = loader.find_template('priority/foo.html')

        self.assertEqual(t1.render(Context({})), 'priority\n')





@override_settings(

    TEMPLATE_LOADERS=('django.template.loaders.filesystem.Loader',

                      'django.template.loaders.app_directories.Loader',),

)

class PriorityLoader(TestCase):

    def test_basic(self):

        """

        Check that the order of template loader works. Refs #21460.

        """

        t1, name = loader.find_template('priority/foo.html')

        self.assertEqual(t1.render(Context({})), 'priority\n')

tests/templates/priority/foo.html

0 → 100644
+1 −0
Original line number Diff line number Diff line 
priority