From c82d76fc28a7c58be11050e29ddb96cd59beb608 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Thu, 1 Oct 2015 18:16:39 +0200
Subject: [PATCH] Fix #115 - stop shadowing the context processor's config
 variable when rendering the admin change list.

---
 constance/admin.py                                  |  6 +++---
 .../templates/admin/constance/change_list.html      |  2 +-
 tests/settings.py                                   | 13 +++++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/constance/admin.py b/constance/admin.py
index 44f7f79..58ba909 100644
--- a/constance/admin.py
+++ b/constance/admin.py
@@ -121,7 +121,7 @@ class ConstanceAdmin(admin.ModelAdmin):
                 )
                 return HttpResponseRedirect('.')
         context = {
-            'config': [],
+            'config_values': [],
             'title': _('Constance config'),
             'app_label': 'constance',
             'opts': Config._meta,
@@ -134,7 +134,7 @@ class ConstanceAdmin(admin.ModelAdmin):
             # Then if the returned value is None, get the default
             if value is None:
                 value = getattr(config, name)
-            context['config'].append({
+            context['config_values'].append({
                 'name': name,
                 'default': localize(default),
                 'help_text': _(help_text),
@@ -142,7 +142,7 @@ class ConstanceAdmin(admin.ModelAdmin):
                 'modified': value != default,
                 'form_field': form[name],
             })
-        context['config'].sort(key=itemgetter('name'))
+        context['config_values'].sort(key=itemgetter('name'))
         request.current_app = self.admin_site.name
         # compatibility to be removed when 1.7 is deprecated
         extra = {'current_app': self.admin_site.name} if VERSION < (1, 8) else {}
diff --git a/constance/templates/admin/constance/change_list.html b/constance/templates/admin/constance/change_list.html
index d284ffd..746e263 100644
--- a/constance/templates/admin/constance/change_list.html
+++ b/constance/templates/admin/constance/change_list.html
@@ -60,7 +60,7 @@
                     <th><div class="text">{% trans "Is modified" %}</div></th>
                 </tr>
                 </thead>
-                {% for item in config %}
+                {% for item in config_values %}
                 <tr class="{% cycle 'row1' 'row2' %}">
                     <th>{{ item.name }}
                         <div class="help">{{ item.help_text|linebreaksbr }}</div>
diff --git a/tests/settings.py b/tests/settings.py
index bce6f88..647a0e4 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -83,7 +83,20 @@ TEMPLATES = [
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
+                'constance.context_processors.config',
             ],
         },
     },
 ]
+
+TEMPLATE_CONTEXT_PROCESSORS = (
+    'django.contrib.auth.context_processors.auth',
+    'django.core.context_processors.debug',
+    'django.core.context_processors.i18n',
+    'django.core.context_processors.media',
+    'django.core.context_processors.static',
+    'django.core.context_processors.tz',
+    'django.core.context_processors.request',
+    'django.contrib.messages.context_processors.messages',
+    'constance.context_processors.config',
+)