fixes the problem of OSQA-234 - events had no titles. Uses the proper action describ...

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

diff --git a/forum/skins/default/media/style/style.css b/forum/skins/default/media/style/style.css
index 00c48b9ee244fafd6d8e9ecd48e38aa3f4aafbe2..a8a43ae2a2c9b80e2562e91d74b60aa2f07ca109 100644 (file)
--- 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 9be35c86b071ebab959c410b48dbc0ae5cbcc730..dfe5cd1dafb2dd959ee7bd6a1b6281f7f7459214 100644 (file)
--- a/forum/skins/default/templates/users/reputation.html
+++ b/forum/skins/default/templates/users/reputation.html
@@ -34,7 +34,7 @@
                         <div style="float:left;width:20px;color:red">{{ rep.negative }}</div>
                         
                     </div>
-                    <a href="{{ rep.action.node.get_absolute_url }}">{{ rep.action.node.headline }}</a> <span class="small">({{ rep.date }})</span>
+                    {{ rep.action.describe|safe }}<br/><span class="small">({{ rep.date }})</span>
                 </p>
                 {% endfor %}
             </div>

diff --git a/forum/views/users.py b/forum/views/users.py
index 6818974213892e49704d58e4ee536d971003e584..55a16099693250b4810c6e74a7f76f1da0b5e6f6 100644 (file)
--- 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))\r
     ])\r
 \r
-    return {"view_user": user, "reputation": reversed(rep), "graph_data": graph_data}\r
+    rep = user.reputes.filter(action__canceled=False).order_by('-date')[0:20]\r
+    \r
+    return {"view_user": user, "reputation": rep, "graph_data": graph_data}\r
 \r
 @user_view('users/questions.html', 'favorites', _('favorite questions'),  _('favorite questions'))\r
 def user_favorites(request, user):\r