From 78332a5ced36df0636f05b4a6b4e220c1e78b508 Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Thu, 28 Aug 2014 18:18:40 +0100 Subject: [PATCH] Fixed shortcut button triggering full refresh --- api/serialisers.py | 3 ++- spa/models/comment.py | 7 +++++++ static/js/dss/templates/sidebarleftnav.jst | 8 ++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/api/serialisers.py b/api/serialisers.py index 2fa2591..252dc01 100644 --- a/api/serialisers.py +++ b/api/serialisers.py @@ -4,7 +4,8 @@ from spa.models.comment import Comment class CommentSerialiser(serializers.HyperlinkedModelSerializer): user = serializers.RelatedField(many=False) + avatar_image = serializers.Field(source='avatar_image') class Meta: model = Comment - fields = ('comment', 'date_created', 'user') \ No newline at end of file + fields = ('comment', 'date_created', 'user', 'avatar_image') \ No newline at end of file diff --git a/spa/models/comment.py b/spa/models/comment.py index 281f100..b3936e7 100755 --- a/spa/models/comment.py +++ b/spa/models/comment.py @@ -21,3 +21,10 @@ class Comment(BaseModel): def create_activity(self): pass + + @property + def avatar_image(self): + if self.user is None: + return UserProfile.get_default_avatar_image() + else: + return self.user.get_profile().get_avatar_image() diff --git a/static/js/dss/templates/sidebarleftnav.jst b/static/js/dss/templates/sidebarleftnav.jst index d0dd531..e887574 100644 --- a/static/js/dss/templates/sidebarleftnav.jst +++ b/static/js/dss/templates/sidebarleftnav.jst @@ -2,19 +2,19 @@