diff options
| author | Aurélien Bompard <aurelien@bompard.org> | 2012-12-11 17:43:42 +0100 |
|---|---|---|
| committer | Aurélien Bompard <aurelien@bompard.org> | 2012-12-11 18:16:53 +0100 |
| commit | 71b5089b6d9b6cf45d5d14ee08c96ac4273323ce (patch) | |
| tree | 046d2d1d306e602e83cbea411e7606ddee590842 /hyperkitty | |
| parent | 2bae760f4cad07653e5285ac9ccd4b6998fba3ac (diff) | |
| download | hyperkitty-71b5089b6d9b6cf45d5d14ee08c96ac4273323ce.tar.gz hyperkitty-71b5089b6d9b6cf45d5d14ee08c96ac4273323ce.tar.xz hyperkitty-71b5089b6d9b6cf45d5d14ee08c96ac4273323ce.zip | |
Fix votes on the profile page
Diffstat (limited to 'hyperkitty')
| -rw-r--r-- | hyperkitty/templates/user_profile.html | 8 | ||||
| -rw-r--r-- | hyperkitty/views/accounts.py | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/hyperkitty/templates/user_profile.html b/hyperkitty/templates/user_profile.html index 6a6c5ac..4362877 100644 --- a/hyperkitty/templates/user_profile.html +++ b/hyperkitty/templates/user_profile.html @@ -39,7 +39,9 @@ {% for vote in votes_up %} <li> {% if vote.message.content|trimString|length > 0 %} - <a href="{% url message_index mlist_fqdn=vote.list_address, hashid=vote.messageid %}">{{ vote.message.content|truncatechars:20 }}</a> + <a href="{% url message_index mlist_fqdn=vote.list_address, hashid=vote.messageid %}" + >{{ vote.message.subject }}</a> by {{ vote.message.sender_name }} + ({{ vote.message|viewer_date|date:"l, j F Y H:i:s" }}) {% else %} <a href="{% url message_index mlist_fqdn=vote.list_address, hashid=vote.messageid %}">Message is empty</a> {% endif %} @@ -54,7 +56,9 @@ {% for vote in votes_down %} <li> {% if vote.message.content|trimString|length > 0 %} - <a href="{% url message_index mlist_fqdn=vote.list_address, hashid=vote.messageid %}">{{ vote.message.content|truncatechars:20 }}</a> + <a href="{% url message_index mlist_fqdn=vote.list_address, hashid=vote.messageid %}" + >{{ vote.message.subject }}</a> by {{ vote.message.sender_name }} + ({{ vote.message|viewer_date|date:"l, j F Y H:i:s" }}) {% else %} <a href="{% url message_index mlist_fqdn=vote.list_address, hashid=vote.messageid %}">Message is empty</a> {% endif %} diff --git a/hyperkitty/views/accounts.py b/hyperkitty/views/accounts.py index 01edb63..f06a242 100644 --- a/hyperkitty/views/accounts.py +++ b/hyperkitty/views/accounts.py @@ -96,10 +96,10 @@ def user_profile(request, user_email=None): votes_up = [] votes_down = [] for vote in votes: - message = store.get_message_by_id_from_list( - vote.list_address, vote.message_id) + message = store.get_message_by_hash_from_list( + vote.list_address, vote.messageid) vote_data = {"list_address": vote.list_address, - "message_id": vote.message_id, + "messageid": vote.messageid, "message": message, } if vote.vote == 1: |