message/models.py

@@ -61,7 +61,7 @@ class UserMessageInfo(CreateUpdateMixin):

                         try:
              

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

                         except GroupPhotoInfo.DoesNotExist:
              

                -            group_photo = None
              

                +            group_photo = {}
              

                         return {
              

                             'pk': self.pk,
              

                             'from_uid': self.from_uid,
              
@@ -69,10 +69,7 @@ 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,
              

                -            'comment_num': group_photo and group_photo.comment_num,
              

                -            'thumbup_num': group_photo and group_photo.thumbup_num,
              

                +            'group_photo_info': group_photo and group_photo.photo_info(user_id),
              

                             'msg_title': self.msg_title,
              

                             'msg_content': self.msg_content,
              

                             'read': self.read,