group/views.py

@@ -2,7 +2,6 @@

                 
              

                 from __future__ import division
              

                 
              

                -import itertools
              

                 import os
              

                 import random
              

                 
              
@@ -909,8 +908,9 @@ def pai2_home_api(request):

                         'comment_num': row[18],
              

                         'thumbup_num': row[19],
              

                         'photo_from': row[20],
              

                -        'created_at': row[21],
              

                -        'origin_expired_stamps': origin_expired_stamps(row[22], row[15]),
              

                +        'session_id': row[21],
              

                +        'created_at': row[22],
              

                +        'origin_expired_stamps': origin_expired_stamps(row[23], row[15]),
              

                         'thumbup': get_group_photo_thumbup_flag(row[5], user_id),
              

                         'porder': get_lensman_order_record(row[5], user_id) if row[20] == GroupPhotoInfo.SESSION_GROUP else {},
              

                     } for row in rows]
              

utils/sql/raw.py

@@ -5,7 +5,7 @@ PAI2_HOME_API = (

                     r"T1.group_id, T2.group_name, T2.group_default_avatar, T2.group_avatar, T2.group_from, T3.id as photo_id, "
              

                     r"T3.photo_path, T3.photo_w, T3.photo_h, T3.photo_thumbnail_path, T3.photo_thumbnail_w, T3.photo_thumbnail_h, "
              

                     r"T3.photo_thumbnail2_path, T3.photo_thumbnail2_w, T3.photo_thumbnail2_h, T3.user_id, T3.nickname, T3.avatar, "
              

                -    r"T3.comment_num, T3.thumbup_num, T3.photo_from, T3.created_at, T3.lensman_photo_id "
              

                +    r"T3.comment_num, T3.thumbup_num, T3.photo_from, T3.session_id, T3.created_at, T3.lensman_photo_id "
              

                     r"from (select * from group_groupuserinfo where user_id='{user_id}' and user_status=1) as T1 "
              

                     r"left outer join group_groupinfo as T2 on T1.group_id = T2.group_id "
              

                     r"left outer join group_groupphotoinfo as T3 on T1.group_id = T3.group_id and T3.id > T1.current_id "