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 2014/09/29 18:17:56 UTC
[25/27] git commit: [#7657] show page access at day granularity,
since thats how its tracked
[#7657] show page access at day granularity, since thats how its tracked
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/2927ea55
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/2927ea55
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/2927ea55
Branch: refs/heads/db/7657
Commit: 2927ea55089c686cae4dc1daedcf0a6427e87c89
Parents: 492bf8e
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Fri Sep 26 20:23:00 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Fri Sep 26 21:57:42 2014 +0000
----------------------------------------------------------------------
Allura/allura/templates/site_admin_user_details.html | 6 +++---
Allura/allura/tests/functional/test_site_admin.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/2927ea55/Allura/allura/templates/site_admin_user_details.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_user_details.html b/Allura/allura/templates/site_admin_user_details.html
index dd771cc..18d2dff 100644
--- a/Allura/allura/templates/site_admin_user_details.html
+++ b/Allura/allura/templates/site_admin_user_details.html
@@ -32,7 +32,7 @@
<ul>
<li>Username: {{ user.username }} (<a href="{{ user.url() }}">Go to profile page</a>)</li>
<li>Full name: {{ user.get_pref('display_name') }}</li>
- <li>Registered: {{ user.registration_date() }} ({{ h.ago(user.registration_date()) }})</li>
+ <li>Registered: {{ user.registration_date() }} ({{ h.ago(user.registration_date(), show_date_after=None) }})</li>
</ul>
{% block extra_general_info %}{% endblock %}
</div>
@@ -81,13 +81,13 @@
<legend>Session</legend>
<h3>Last login</h3>
<ul>
- <li>Date: {{ user.last_access.login_date }} ({{ h.ago(user.last_access.login_date) }})</li>
+ <li>Date: {{ user.last_access.login_date }} ({{ h.ago(user.last_access.login_date, show_date_after=None) }})</li>
<li>IP: {{ user.last_access.login_ip }}</li>
<li>UA: {{ user.last_access.login_ua }}</li>
</ul>
<h3>Last page access</h3>
<ul>
- <li>Date: {{ user.last_access.session_date }} ({{ h.ago(user.last_access.session_date) }})</li>
+ <li>Date: {{ user.last_access.session_date and user.last_access.session_date.date() }}</li>
<li>IP: {{ user.last_access.session_ip }}</li>
<li>UA: {{ user.last_access.session_ua }}</li>
</ul>
http://git-wip-us.apache.org/repos/asf/allura/blob/2927ea55/Allura/allura/tests/functional/test_site_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_site_admin.py b/Allura/allura/tests/functional/test_site_admin.py
index 37338d7..793f192 100644
--- a/Allura/allura/tests/functional/test_site_admin.py
+++ b/Allura/allura/tests/functional/test_site_admin.py
@@ -301,7 +301,7 @@ class TestUserDetails(TestController):
assert_in('Date: 2014-09-02 06:06:06', r)
assert_in('IP: 8.8.8.8', r)
assert_in('UA: browser of the future 1.0', r)
- assert_in('Date: 2014-09-12 06:06:06', r)
+ assert_in('Date: 2014-09-12', r)
assert_in('IP: 7.7.7.7', r)
assert_in('UA: browser of the future 1.1', r)
# list of projects