From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Wed, 4 Jan 2012 22:48:55 +0000 (+0100)
Subject: f691: Use StrictUndefined for templates and fix some issues
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f1cdd278e7cf195e485567ed0d0d8a90cad81e48;p=mediagoblin.git

f691: Use StrictUndefined for templates and fix some issues

References to undefined variables in templates were
silently ignored/converted to None/empty strings. This
makes coding lazy stuff easy, but it makes catching typos
harder.
(It would have catched one of the SQL things earlier!)

But on the other hand it might make the current templates
error out everywhere. In fact, early testing has shown two
instances, that errored out. Those are fixed with this
commit too.

If this turns out to make things more complex and useless
than actually solving any problems, it can easily be
dropped again.
---

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 9b331789..4b5c9337 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -60,8 +60,9 @@
       {% trans date=media.created.strftime("%Y-%m-%d") -%}
         Added on {{ date }}.
       {%- endtrans %}
-      {% if media['uploader'] == request.user._id or 
-                               request.user['is_admin'] %}
+      {% if request.user and
+            (media.uploader == request.user._id or 
+             request.user.is_admin) %}
         {% set edit_url = request.urlgen('mediagoblin.edit.edit_media',
                                    user= media.get_uploader.username,
                                    media= media._id) %}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index b952e88c..78bbaf8c 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -113,7 +113,8 @@
     {% else %}
       <div class="grid_6 alpha">
         {% include "mediagoblin/utils/profile.html" %}
-        {% if request.user._id == user._id or request.user.is_admin %}
+        {% if request.user and
+              (request.user._id == user._id or request.user.is_admin) %}
           <a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
                           user.username }}">
             {%- trans %}Edit profile{% endtrans -%}
diff --git a/mediagoblin/tools/template.py b/mediagoblin/tools/template.py
index d0400347..54a40de6 100644
--- a/mediagoblin/tools/template.py
+++ b/mediagoblin/tools/template.py
@@ -41,8 +41,11 @@ def get_jinja_env(template_loader, locale):
     if SETUP_JINJA_ENVS.has_key(locale):
         return SETUP_JINJA_ENVS[locale]
 
+    # jinja2.StrictUndefined will give exceptions on references
+    # to undefined/unknown variables in templates.
     template_env = jinja2.Environment(
         loader=template_loader, autoescape=True,
+        undefined=jinja2.StrictUndefined,
         extensions=['jinja2.ext.i18n', 'jinja2.ext.autoescape'])
 
     template_env.install_gettext_callables(