From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 22 Dec 2014 13:53:30 +0000 (+0100)
Subject: fix INSTALLED_APPS in base
X-Git-Tag: 1.5.0rc5~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ba8ba0219003d1612bd4bb72095165e5fdfeb86f;p=telemeta.git

fix INSTALLED_APPS in base
---

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index 9a84db3e..3a4a714e 100644
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -2,7 +2,8 @@
 {% load i18n %}
 {% load telemeta_utils %}
 {% load bootstrap3 %}
-{% if get_googletools %}
+{% settings_value 'INSTALLED_APPS' as INSTALLED_APPS %}
+{% if 'googletools' in INSTALLED_APPS %}
 {% load googletools %}
 {% endif %}
 
@@ -15,6 +16,13 @@
 <meta charset="utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
+{% block analytics %}
+{% if 'googletools' in INSTALLED_APPS %}
+{% site_verification_code %}
+{% analytics_code %}
+{% endif %}
+{% endblock analytics %}
+
 <link rel="alternate" href="/rss" title="RSS 2.0" type="application/rss+xml" />
 
 <title>{%block head_title %}{% description %} - Telemeta{% endblock %}</title>
@@ -187,12 +195,5 @@
 </div>
 {% endblock layout %}
 
-{% block analytics %}
-{% if get_googletools %}
-{% site_verification_code %}
-{% analytics_code %}
-{% endif %}
-{% endblock analytics %}
-
 </body>
 </html>
diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py
index 8efadbbf..d0bf3a39 100644
--- a/telemeta/templatetags/telemeta_utils.py
+++ b/telemeta/templatetags/telemeta_utils.py
@@ -464,3 +464,7 @@ def logo_url():
 def get_googletools():
     return 'googletools' in settings.INSTALLED_APPS
 
+@register.assignment_tag
+def settings_value(name):
+    return getattr(settings, name, "")
+