You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/08/13 21:54:20 UTC
[1/2] git commit: [#6556] turn on strict template vars for tests & dev
Updated Branches:
refs/heads/db/6556 [created] d5230bd73
[#6556] turn on strict template vars for tests & dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/42fc64f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/42fc64f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/42fc64f1
Branch: refs/heads/db/6556
Commit: 42fc64f1ef0e5b666bdb5d73300e561e9ab88bd7
Parents: fea4b5f
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Tue Aug 13 19:53:58 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Aug 13 19:53:58 2013 +0000
----------------------------------------------------------------------
Allura/allura/config/app_cfg.py | 5 ++++-
Allura/development.ini | 1 +
Allura/test.ini | 2 ++
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/42fc64f1/Allura/allura/config/app_cfg.py
----------------------------------------------------------------------
diff --git a/Allura/allura/config/app_cfg.py b/Allura/allura/config/app_cfg.py
index 6f15406..24f6d93 100644
--- a/Allura/allura/config/app_cfg.py
+++ b/Allura/allura/config/app_cfg.py
@@ -38,6 +38,7 @@ import pylons
from tg.configuration import AppConfig, config
from routes import Mapper
from webhelpers.html import literal
+from paste.deploy.converters import asbool
import ew
@@ -96,7 +97,9 @@ class ForgeConfig(AppConfig):
auto_reload=config.auto_reload_templates,
autoescape=True,
bytecode_cache=bcc,
- extensions=['jinja2.ext.do', 'jinja2.ext.i18n'])
+ extensions=['jinja2.ext.do', 'jinja2.ext.i18n'],
+ undefined=jinja2.StrictUndefined if asbool(config.get('jinja_strict_undefined')) else jinja2.Undefined,
+ )
jinja2_env.install_gettext_translations(pylons.i18n)
jinja2_env.filters['filesizeformat'] = helpers.do_filesizeformat
jinja2_env.filters['datetimeformat'] = helpers.datetimeformat
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/42fc64f1/Allura/development.ini
----------------------------------------------------------------------
diff --git a/Allura/development.ini b/Allura/development.ini
index 338b8ee..d3b65d8 100644
--- a/Allura/development.ini
+++ b/Allura/development.ini
@@ -52,6 +52,7 @@ base_url = http://localhost:8080
#lang = ru
cache_dir = %(here)s/data
+jinja_strict_undefined = true
beaker.session.key = allura
beaker.session.type = cookie
beaker.session.secret = 61ece7db-ba8d-49fe-a923-ab444741708c
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/42fc64f1/Allura/test.ini
----------------------------------------------------------------------
diff --git a/Allura/test.ini b/Allura/test.ini
index 7394359..3b5a0cb 100644
--- a/Allura/test.ini
+++ b/Allura/test.ini
@@ -40,6 +40,8 @@ db_prefix = test_
site_name = Allura
base_url = http://localhost
+jinja_strict_undefined = true
+
# Use test MongoDB DB server
# ming.main.master = mongo://127.0.0.1:27018/allura
ming.main.uri = mim:///allura
[2/2] git commit: [#6556] start fixing undefined vars in templates
Posted by br...@apache.org.
[#6556] start fixing undefined vars in templates
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/d5230bd7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/d5230bd7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/d5230bd7
Branch: refs/heads/db/6556
Commit: d5230bd73239fc06a80bc2d24918e030b20b80ff
Parents: 42fc64f
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Tue Aug 13 19:54:14 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Aug 13 19:54:14 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/lib.html | 2 +-
Allura/allura/templates/jinja_master/master.html | 14 +++++++-------
Allura/allura/templates/jinja_master/nav_menu.html | 2 +-
.../allura/templates/jinja_master/sidebar_menu.html | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d5230bd7/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index a3e8d6b..999b53b 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -28,7 +28,7 @@
{% endif %}
{%- endmacro %}
-{% macro gravatar(user, size, className) -%}
+{% macro gravatar(user, size, className=None) -%}
{% set display_name = h.really_unicode(user.display_name) %}
{% if user.icon_url() %}
<img src="{{user.icon_url()}}"
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d5230bd7/Allura/allura/templates/jinja_master/master.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
index e3afa6a..2501cc6 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -57,7 +57,7 @@
<style type="text/css">
{{c.project.neighborhood.get_custom_css()|safe}}
</style>
- {% elif neighborhood and neighborhood.css %}
+ {% elif neighborhood|default and neighborhood.css %}
<style type="text/css">
{{neighborhood.get_custom_css()}}
</style>
@@ -76,7 +76,7 @@
{% endfor %}
{{theme_macros.header(g.login_url, '/auth/logout')}}
{% set flash = tg.flash_obj.render('flash', use_js=False) %}
- <section id="page-body" class="{{g.document_class(neighborhood)}}">
+ <section id="page-body" class="{{g.document_class(neighborhood|default)}}">
<div id="nav_menu_holder">
{% block nav_menu %}
{% include g.theme.nav_menu %}
@@ -88,7 +88,7 @@
{% endblock %}
</div>
<div id="content_base">
- {% if not hide_left_bar %}
+ {% if not hide_left_bar|default %}
{% block sidebar_menu %}
{% include g.theme.sidebar_menu %}
{% endblock %}
@@ -96,7 +96,7 @@
{% else %}
{% set outer_width = 24 %}
{% endif %}
- {% if show_right_bar %}
+ {% if show_right_bar|default %}
{% set inner_width = outer_width - 8 %}
{% else %}
{% set inner_width = outer_width %}
@@ -110,11 +110,11 @@
<!-- /actions -->
</h2>
{% block edit_box %}{% endblock %}
- <div{% if show_right_bar %} class="{% block inner_grid %}grid-{{inner_width}}"{% endblock %}{% endif %}>
+ <div{% if show_right_bar|default %} class="{% block inner_grid %}grid-{{inner_width}}"{% endblock %}{% endif %}>
{% block before_content %}{% endblock %}
{% block content %}{% endblock %}
</div>
- {% if show_right_bar %}
+ {% if show_right_bar|default %}
<div id="sidebar-right" class="grid-6 fright">
{% block right_content %}{% endblock %}
</div>
@@ -139,7 +139,7 @@
{{ blob }}
{% endfor %}
{% block extra_js %}{% endblock %}
- {% if neighborhood %}
+ {% if neighborhood|default %}
{{ neighborhood.site_specific_html | safe }}
{% elif c.project.neighborhood %}
{{ c.project.neighborhood.site_specific_html | safe }}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d5230bd7/Allura/allura/templates/jinja_master/nav_menu.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/nav_menu.html b/Allura/allura/templates/jinja_master/nav_menu.html
index 4280881..06880a5 100644
--- a/Allura/allura/templates/jinja_master/nav_menu.html
+++ b/Allura/allura/templates/jinja_master/nav_menu.html
@@ -47,7 +47,7 @@
{% if loop.last and admins|length > 5 -%}
and <a href="{{ c.project.url() }}_members/">{{ admins|length - 4 }} others</a>
{% else %}
- <a href="{{ admin.url() }}">{{ admin.username }}</a>{{ ',' if not loop.last }}
+ <a href="{{ admin.url() }}">{{ admin.username }}</a>{{ ',' if not loop.last else '' }}
{% endif %}
{%- endfor -%}
</div>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d5230bd7/Allura/allura/templates/jinja_master/sidebar_menu.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/sidebar_menu.html b/Allura/allura/templates/jinja_master/sidebar_menu.html
index f8b9c8e..98b38e4 100644
--- a/Allura/allura/templates/jinja_master/sidebar_menu.html
+++ b/Allura/allura/templates/jinja_master/sidebar_menu.html
@@ -19,7 +19,7 @@
{% set ul_active = [] %}
{% macro sidebar_item(s) -%}
{% if s.url %}
- {% if not ul_active[-1] %}
+ {% if not ul_active or not ul_active[-1] %}
<ul class="sidebarmenu">
{% do ul_active.append(True) %}
{% endif %}
@@ -45,7 +45,7 @@
{% else %}
<div> </div>
{% endif %}
- {% if c.custom_sidebar_menu %}
+ {% if c.custom_sidebar_menu|default %}
{% for s in c.custom_sidebar_menu %}
{{sidebar_item(s)}}
{% endfor %}