group/models.py

@@ -134,8 +134,8 @@ class GroupPhotoInfo(CreateUpdateMixin):

                     def photo_info(self):
              

                         return {
              

                             'photo_id': self.pk,
              

                -            'photo_path': self.photo_url,
              

                -            'photo_thumbnail_path': self.photo_thumbnail_url,
              

                +            'photo_url': self.photo_url,
              

                +            'photo_thumbnail_url': self.photo_thumbnail_url,
              

                         }
              

                 
              

                 
              

message/models.py

@@ -6,6 +6,8 @@ from django.utils.translation import ugettext_lazy as _

                 
              

                 from pai2.basemodels import CreateUpdateMixin
              

                 
              

                +from group.models import GroupPhotoInfo
              

                +
              

                 
              

                 class UserMessageInfo(CreateUpdateMixin):
              

                     SYSTEM = 'system'
              
@@ -57,6 +59,10 @@ class UserMessageInfo(CreateUpdateMixin):

                 
              

                     @property
              

                     def msg_info(self):
              

                +        try:
              

                +            group_photo = GroupPhotoInfo.objects.get(pk=self.photo_id)
              

                +        except GroupPhotoInfo.DoesNotExist:
              

                +            group_photo = None
              

                         return {
              

                             'pk': self.pk,
              

                             'from_uid': self.from_uid,
              
@@ -64,6 +70,8 @@ class UserMessageInfo(CreateUpdateMixin):

                             'from_avatar': self.from_avatar,
              

                             'group_id': self.group_id,
              

                             'photo_id': self.photo_id,
              

                +            'photo_url': group_photo and group_photo.photo_url,
              

                +            'photo_thumbnail_url': group_photo and group_photo.photo_thumbnail_url,
              

                             'msg_title': self.msg_title,
              

                             'msg_content': self.msg_content,
              

                             'read': self.read,