You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2014/01/23 23:18:19 UTC
git commit: [#6982] [#6995] [#7019] ticket:520 Author on repo history
page is missing sometimes
Updated Branches:
refs/heads/master 3e45f6cc6 -> 8a337c53c
[#6982] [#6995] [#7019] ticket:520 Author on repo history page is missing sometimes
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/8a337c53
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/8a337c53
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/8a337c53
Branch: refs/heads/master
Commit: 8a337c53ce8e8218c817cda67364163fc181c708
Parents: 3e45f6c
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Mon Jan 20 19:59:05 2014 +0400
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Thu Jan 23 22:18:08 2014 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/lib.html | 12 +++++-------
ForgeGit/forgegit/tests/functional/test_controllers.py | 1 +
2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8a337c53/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 9d3aa2c..133eee8 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -73,14 +73,12 @@
{% macro email_link(email, name, size=16) -%}
{% set user = h.find_user(email) -%}
- {% if user %}
- {% if not user.is_anonymous() %}
- <a href="{{user.url()}}">
- {{ email_gravatar(email, name, size) }} {{ name }}
- </a>
- {% else %}
+ {% if user and not user.is_anonymous() %}
+ <a href="{{user.url()}}">
{{ email_gravatar(email, name, size) }} {{ name }}
- {% endif %}
+ </a>
+ {% else %}
+ {{ email_gravatar(email, name, size) }} {{ name }}
{% endif %}
{%- endmacro %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8a337c53/ForgeGit/forgegit/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index 310ed47..c9d296c 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -124,6 +124,7 @@ class TestRootController(_TestCase):
assert 'tree/README?format=raw">Download</a>' not in resp
assert 'Tree' in resp.html.findAll(
'td')[2].text, resp.html.findAll('td')[2].text
+ assert 'byRick Copeland' in resp.html.findAll('td')[0].text, resp.html.findAll('td')[0].text
resp = self.app.get(
'/src-git/ci/1e146e67985dcd71c74de79613719bef7bddca4a/log/?path=/README')
assert 'View' in resp.html.findAll('td')[2].text