Better handling for the last_activity user profile info.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@581 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/models/user.py b/forum/models/user.py
index b18047e9295ccb208b18293cad1c188ef12e7bc6..124ea17ca3465d235a91d54a2050ac713a427950 100644 (file)
--- a/forum/models/user.py
+++ b/forum/models/user.py
@@ -159,7 +159,7 @@ class User(BaseModel, DjangoUser):
         try:
             return self.actions.order_by('-action_date')[0].action_date
         except:
-            return None
+            return self.last_seen
 
     @property
     def gravatar(self):

diff --git a/forum/skins/default/templates/users/info.html b/forum/skins/default/templates/users/info.html
index 382378ffd694aa02f5521e9e86299b346bde8ece..efc49fdebd6295488db45a8f920c1f0bd46e54be 100644 (file)
--- a/forum/skins/default/templates/users/info.html
+++ b/forum/skins/default/templates/users/info.html
@@ -51,7 +51,7 @@
                 {% if view_user.last_seen %}
                 <tr>
                     <td>{% trans "last seen" %}</td>
-                    <td><strong title="{{ view_user.last_activity }}">{% if view_user.last_activity %}{% diff_date view_user.last_activity %}{% else %}{% trans "Never" %}{% endif %}</strong></td>
+                    <td><strong title="{{ view_user.last_activity }}">{% diff_date view_user.last_activity %}</strong></td>
                 </tr>
                 {% endif %}
                 {% if view_user.website %}