From 3db8dd7d9328e38fbc8eacf0f7553778bc31d94f Mon Sep 17 00:00:00 2001 From: Aamir Khan Date: Thu, 5 Jul 2012 11:53:09 -0400 Subject: Display message snippet on user profile page --- models.py | 11 +++++++++++ templates/base.html | 2 +- templates/user_profile.html | 30 ++++++++++++++++++++++++++++-- templatetags/poll_extras.py | 5 +++++ 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/models.py b/models.py index 0193705..da28552 100644 --- a/models.py +++ b/models.py @@ -1,7 +1,13 @@ from django.db import models from django.contrib.auth.models import User +from django.conf import settings + +from kittystore.kittysastore import KittySAStore + from gsoc.utils import log +STORE = KittySAStore(settings.KITTYSTORE_URL) + class Rating(models.Model): # @TODO: instead of list_address, user list model from kittystore? @@ -36,6 +42,11 @@ class UserProfile(models.Model): except Rating.DoesNotExist: votes = {} + for vote in votes: + list_name = vote.list_address.split('@')[0] + message = STORE.get_email(list_name, vote.messageid) + vote.message = message + return votes votes = property(_get_votes) diff --git a/templates/base.html b/templates/base.html index ee1f66e..0ae6d4c 100644 --- a/templates/base.html +++ b/templates/base.html @@ -3,7 +3,7 @@ - {% block title %}{{ app_name }}{% endblock %} + {% block title %}{{ app_name|title }}{% endblock %} diff --git a/templates/user_profile.html b/templates/user_profile.html index 057ef6b..f0aa27e 100644 --- a/templates/user_profile.html +++ b/templates/user_profile.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% load i18n %} +{% load poll_extras %} {% block content %}

User Profile - {{ user }}

@@ -32,12 +33,37 @@ -

Votes :

+

Up Votes :

+

Down Votes :

+ + + + {% endblock %} diff --git a/templatetags/poll_extras.py b/templatetags/poll_extras.py index bdfbbc5..a5f1032 100644 --- a/templatetags/poll_extras.py +++ b/templatetags/poll_extras.py @@ -1,9 +1,14 @@ from django import template from django.http import HttpRequest from django.utils.datastructures import SortedDict +import re register = template.Library() +@register.filter(name="trimString") +def trimString(str): + return re.sub('\s+', ' ', str) + @register.filter(name='sort') def listsort(value): if isinstance(value, dict): -- cgit