From e6d9fbafa13f1acaabaef37cacef4091a287dd3c Mon Sep 17 00:00:00 2001 From: matt Date: Tue, 18 May 2010 14:33:51 +0000 Subject: [PATCH] fixes the problem of OSQA-234 - events had no titles. Uses the proper action describe text now so that it matches our activity stream wording. Also added back a missing style for .small git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@297 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum/skins/default/media/style/style.css | 4 ++++ forum/skins/default/templates/users/reputation.html | 2 +- forum/views/users.py | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/forum/skins/default/media/style/style.css b/forum/skins/default/media/style/style.css index 00c48b9..a8a43ae 100644 --- a/forum/skins/default/media/style/style.css +++ b/forum/skins/default/media/style/style.css @@ -756,6 +756,10 @@ table.check-table td { padding-right: 50px; } margin: 0; } +.small { + font-size: 11px; +} + span.form-error { color: #990000; font-size: 90%; diff --git a/forum/skins/default/templates/users/reputation.html b/forum/skins/default/templates/users/reputation.html index 9be35c8..dfe5cd1 100644 --- a/forum/skins/default/templates/users/reputation.html +++ b/forum/skins/default/templates/users/reputation.html @@ -34,7 +34,7 @@
{{ rep.negative }}
- {{ rep.action.node.headline }} ({{ rep.date }}) + {{ rep.action.describe|safe }}
({{ rep.date }})

{% endfor %} diff --git a/forum/views/users.py b/forum/views/users.py index 6818974..55a1609 100644 --- a/forum/views/users.py +++ b/forum/views/users.py @@ -227,7 +227,9 @@ def user_reputation(request, user): for i in range(len(values)) ]) - return {"view_user": user, "reputation": reversed(rep), "graph_data": graph_data} + rep = user.reputes.filter(action__canceled=False).order_by('-date')[0:20] + + return {"view_user": user, "reputation": rep, "graph_data": graph_data} @user_view('users/questions.html', 'favorites', _('favorite questions'), _('favorite questions')) def user_favorites(request, user): -- 2.45.1