From b95439a8fb05d5c580c47688994621fa204517ac Mon Sep 17 00:00:00 2001
From: Stefan Foulis <stefan@foulis.ch>
Date: Mon, 7 Mar 2016 09:19:57 +0100
Subject: [PATCH] fix infinite template recursion in Django 1.6

Django 1.6 does not support including the same template in itself, even
if a conditional would prevent infinite recursion at runtime.
See https://code.djangoproject.com/ticket/3544

This solution is also more efficient, as it only causes one query
instead of at least n+1, where n is the folder depth.
---
 .../admin/filer/folder/directory_listing.html        | 10 +++++++++-
 .../admin/filer/folder/folders_recursice.html        | 12 ------------
 2 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 filer/templates/admin/filer/folder/folders_recursice.html

diff --git a/filer/templates/admin/filer/folder/directory_listing.html b/filer/templates/admin/filer/folder/directory_listing.html
index 9b22115b4..94dd9d810 100644
--- a/filer/templates/admin/filer/folder/directory_listing.html
+++ b/filer/templates/admin/filer/folder/directory_listing.html
@@ -108,7 +108,15 @@ <h2>&nbsp;</h2>
                                 Root
                             </a>
                         </li>
-                        {% include "admin/filer/folder/folders_recursice.html" %}
+                        {% for folder in folder.logical_path %}
+                            <li>
+                                <a href="{% url 'admin:filer-directory_listing' folder.id %}{% if is_popup %}?_popup=1{% if select_folder %}&amp;select_folder=1{% endif %}{% endif %}"
+                                    title="{% trans 'Go back to the parent folder' %}">
+                                    <img src="{% static 'icons/plainfolder_48x48.png' %}" alt="{% trans 'Folder Icon' %}" width="28" height="28">
+                                    {{ folder.name }}
+                                </a>
+                            </li>
+                        {% endfor %}
                     </ul>
                 </div>
 
diff --git a/filer/templates/admin/filer/folder/folders_recursice.html b/filer/templates/admin/filer/folder/folders_recursice.html
deleted file mode 100644
index cc85014af..000000000
--- a/filer/templates/admin/filer/folder/folders_recursice.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% load i18n staticfiles %}
-
-{% if folder.parent %}
-    <li>
-        <a href="{% url 'admin:filer-directory_listing' folder.parent.id %}{% if is_popup %}?_popup=1{% if select_folder %}&amp;select_folder=1{% endif %}{% endif %}"
-            title="{% trans 'Go back to the parent folder' %}">
-            <img src="{% static 'icons/plainfolder_48x48.png' %}" alt="{% trans 'Folder Icon' %}" width="28" height="28">
-            {{ folder.parent.name }}
-        </a>
-    </li>
-    {% include "admin/filer/folder/folders_recursice.html" with folder=folder.parent %}
-{% endif %}