You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2014/09/12 12:32:30 UTC
[3/5] git commit: [#7657] ticket:649 Display dates better
[#7657] ticket:649 Display dates better
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/1657505e
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/1657505e
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/1657505e
Branch: refs/heads/je/42cc_7657
Commit: 1657505e4e15a4a927d0727a18b8e4620a43563f
Parents: 9a20f38
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Sep 12 11:50:23 2014 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Fri Sep 12 11:50:23 2014 +0300
----------------------------------------------------------------------
Allura/allura/model/auth.py | 7 +++++--
Allura/allura/templates/site_admin_user_details.html | 6 +++---
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/1657505e/Allura/allura/model/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/auth.py b/Allura/allura/model/auth.py
index 48f04f5..f5f9cfb 100644
--- a/Allura/allura/model/auth.py
+++ b/Allura/allura/model/auth.py
@@ -692,8 +692,11 @@ class User(MappedClass, ActivityNode, ActivityObject):
def registration_date(self):
p = plugin.AuthenticationProvider.get(request)
- return p.user_registration_date(self)
-
+ d = p.user_registration_date(self)
+ # provider's user_registration_date returns aware datetime (in UTC)
+ # but we're using naive UTC time everywhere
+ d = datetime.utcfromtimestamp(calendar.timegm(d.utctimetuple()))
+ return d
class OldProjectRole(MappedClass):
http://git-wip-us.apache.org/repos/asf/allura/blob/1657505e/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 155fa20..c4f0965 100644
--- a/Allura/allura/templates/site_admin_user_details.html
+++ b/Allura/allura/templates/site_admin_user_details.html
@@ -30,7 +30,7 @@
<ul>
<li>Username: {{ user.username }}</li>
<li>Full name: {{ user.get_pref('display_name') }}</li>
- <li>Registered: {{ user.registration_date() }}</li>
+ <li>Registered: {{ user.registration_date() }} ({{ h.ago(user.registration_date()) }})</li>
</ul>
</fieldset>
</div>
@@ -42,13 +42,13 @@
<legend>Session</legend>
<h3>Last login</h3>
<ul>
- <li>Date: {{ user.last_access.login_date }}</li>
+ <li>Date: {{ user.last_access.login_date }} ({{ h.ago(user.last_access.login_date) }})</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 }}</li>
+ <li>Date: {{ user.last_access.session_date }} ({{ h.ago(user.last_access.session_date) }})</li>
<li>IP: {{ user.last_access.session_ip }}</li>
<li>UA: {{ user.last_access.session_ua }}</li>
</ul>