Fix bug caused by non-empty TEMPLATE_STRING_IF_INVALID in settings (f…

…ixes dyve#81)
arthursummer · Jun 17, 2013 · c9db9a1 · c9db9a1
1 parent 9c098e9
commit c9db9a1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/bootstrap_toolkit/_version.py b/bootstrap_toolkit/_version.py
@@ -1 +1 @@
-__version__ = '2.13.1'
+__version__ = '2.13.2'
diff --git a/bootstrap_toolkit/templates/bootstrap_toolkit/field_default.html b/bootstrap_toolkit/templates/bootstrap_toolkit/field_default.html
@@ -1,6 +1,18 @@
 {% if field.field.widget.bootstrap %}
     {% with bootstrap=field.field.widget.bootstrap %}
-        {% include "bootstrap_toolkit/field_prepend_append.html" with prepend=prepend|default:bootstrap.prepend|default:"" append=append|default:bootstrap.append|default:"" %}
+        {% if prepend %}
+            {% if append %}
+                {% include "bootstrap_toolkit/field_prepend_append.html" %}
+            {% else %}
+                {% include "bootstrap_toolkit/field_prepend_append.html" with append=bootstrap.append %}
+            {% endif %}
+        {% else %}
+            {% if append %}
+                {% include "bootstrap_toolkit/field_prepend_append.html" with prepend=bootstrap.prepend %}
+            {% else %}
+                {% include "bootstrap_toolkit/field_prepend_append.html" with prepend=bootstrap.prepend append=bootstrap.append %}
+            {% endif %}
+        {% endif %}
     {% endwith %}
 {% else %}
     {% include "bootstrap_toolkit/field_prepend_append.html" %}

diff --git a/demo_project/settings.py b/demo_project/settings.py
@@ -135,9 +135,15 @@
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
+    'filters': {
+         'require_debug_false': {
+             '()': 'django.utils.log.RequireDebugFalse'
+         }
+    },
     'handlers': {
         'mail_admins': {
             'level': 'ERROR',
+            'filters': ['require_debug_false'],
             'class': 'django.utils.log.AdminEmailHandler'
         }
     },
@@ -147,10 +153,9 @@
             'level': 'ERROR',
             'propagate': True,
         },
-    }
+    },
 }
 
-
 # BOOTSTRAP_BASE_URL      = 'http://twitter.github.com/bootstrap/assets/'
 # BOOTSTRAP_CSS_BASE_URL  = BOOTSTRAP_BASE_URL + 'css/'
 # BOOTSTRAP_CSS_URL       = BOOTSTRAP_CSS_BASE_URL + 'bootstrap.css'