return group_from for pai2_home_api
Brightcells
променени са 2 файла, в които са добавени 16 реда и са изтрити 15 реда
+ 15
- 14
group/views.py
@@ -854,20 +854,21 @@ def pai2_home_api(request): |
||
| 854 | 854 |
'group_name': row[1], |
| 855 | 855 |
'group_default_avatar': row[2], |
| 856 | 856 |
'group_avatar': row[3], |
| 857 |
- 'photo_id': row[4], |
|
| 858 |
- 'photo_url': img_url(row[5]), |
|
| 859 |
- 'photo_w': row[6], |
|
| 860 |
- 'photo_h': row[7], |
|
| 861 |
- 'photo_thumbnail_url': img_url(row[8]), |
|
| 862 |
- 'photo_thumbnail_w': row[9], |
|
| 863 |
- 'photo_thumbnail_h': row[10], |
|
| 864 |
- 'user_id': row[11], |
|
| 865 |
- 'nickname': row[12], |
|
| 866 |
- 'avatar': row[13], |
|
| 867 |
- 'comment_num': row[14], |
|
| 868 |
- 'thumbup_num': row[15], |
|
| 869 |
- 'photo_from': row[16], |
|
| 870 |
- 'created_at': row[17], |
|
| 857 |
+ 'group_from': row[4], |
|
| 858 |
+ 'photo_id': row[5], |
|
| 859 |
+ 'photo_url': img_url(row[6]), |
|
| 860 |
+ 'photo_w': row[7], |
|
| 861 |
+ 'photo_h': row[8], |
|
| 862 |
+ 'photo_thumbnail_url': img_url(row[9]), |
|
| 863 |
+ 'photo_thumbnail_w': row[10], |
|
| 864 |
+ 'photo_thumbnail_h': row[11], |
|
| 865 |
+ 'user_id': row[12], |
|
| 866 |
+ 'nickname': row[13], |
|
| 867 |
+ 'avatar': row[14], |
|
| 868 |
+ 'comment_num': row[15], |
|
| 869 |
+ 'thumbup_num': row[16], |
|
| 870 |
+ 'photo_from': row[17], |
|
| 871 |
+ 'created_at': row[18], |
|
| 871 | 872 |
} for row in rows] |
| 872 | 873 |
|
| 873 | 874 |
return JsonResponse({
|
+ 1
- 1
utils/sql/raw.py
@@ -2,7 +2,7 @@ |
||
| 2 | 2 |
|
| 3 | 3 |
PAI2_HOME_API = ( |
| 4 | 4 |
r"select " |
| 5 |
- r"T1.group_id, T2.group_name, T2.group_default_avatar, T2.group_avatar, T3.id, T3.photo_path, T3.photo_w, " |
|
| 5 |
+ r"T1.group_id, T2.group_name, T2.group_default_avatar, T2.group_avatar, T2.group_from, T3.id, T3.photo_path, T3.photo_w, " |
|
| 6 | 6 |
r"T3.photo_h, T3.photo_thumbnail_path, T3.photo_thumbnail_w, T3.photo_thumbnail_h, T3.user_id, T3.nickname, " |
| 7 | 7 |
r"T3.avatar, T3.comment_num, T3.thumbup_num, T3.photo_from, T3.created_at " |
| 8 | 8 |
r"from (select * from group_groupuserinfo where user_id='{user_id}' and user_status=1) as T1 "
|