Change to use 'from paginator import pagination'
Brightcells
Se han modificado 6 ficheros con 5 adiciones y 21 borrados
+ 1
- 1
group/lensman_views.py
@@ -11,6 +11,7 @@ from django.contrib.auth.hashers import check_password |
||
| 11 | 11 |
from django.db import transaction |
| 12 | 12 |
from isoweek import Week |
| 13 | 13 |
from logit import logit |
| 14 |
+from paginator import pagination |
|
| 14 | 15 |
from TimeConvert import TimeConvert as tc |
| 15 | 16 |
|
| 16 | 17 |
from account.models import LensmanInfo, UserIncomeExpensesInfo, UserInfo |
@@ -21,7 +22,6 @@ from photo.models import PhotosInfo |
||
| 21 | 22 |
from utils.error.errno_utils import LensmanStatusCode, OrderStatusCode, UserStatusCode |
| 22 | 23 |
from utils.error.response_utils import response |
| 23 | 24 |
from utils.message_utils import system_messages |
| 24 |
-from utils.page_utils import pagination |
|
| 25 | 25 |
from utils.redis.connect import r |
| 26 | 26 |
from utils.redis.rbrief import set_brief_info |
| 27 | 27 |
from utils.redis.rgroup import set_group_info |
+ 1
- 1
group/views.py
@@ -9,6 +9,7 @@ from curtail_uuid import CurtailUUID |
||
| 9 | 9 |
from django.conf import settings |
| 10 | 10 |
from django.db import connection, transaction |
| 11 | 11 |
from logit import logit |
| 12 |
+from paginator import pagination |
|
| 12 | 13 |
from rest_framework import viewsets |
| 13 | 14 |
from TimeConvert import TimeConvert as tc |
| 14 | 15 |
|
@@ -19,7 +20,6 @@ from message.models import UserMessageInfo |
||
| 19 | 20 |
from utils.error.errno_utils import GroupPhotoStatusCode, GroupStatusCode, GroupUserStatusCode, UserStatusCode |
| 20 | 21 |
from utils.error.response_utils import response |
| 21 | 22 |
from utils.group_photo_utils import get_current_photos |
| 22 |
-from utils.page_utils import pagination |
|
| 23 | 23 |
from utils.redis.connect import r |
| 24 | 24 |
from utils.redis.rgroup import (del_group_photo_thumbup_flag, get_group_info, get_group_photo_comment_list, |
| 25 | 25 |
get_group_photo_data, get_group_photo_thumbup_flag, get_group_photo_thumbup_list, |
+ 1
- 1
message/views.py
@@ -2,13 +2,13 @@ |
||
| 2 | 2 |
|
| 3 | 3 |
from django.conf import settings |
| 4 | 4 |
from logit import logit |
| 5 |
+from paginator import pagination |
|
| 5 | 6 |
|
| 6 | 7 |
from account.models import UserInfo |
| 7 | 8 |
from message.models import SystemMessageDeleteInfo, SystemMessageInfo, SystemMessageReadInfo, UserMessageInfo |
| 8 | 9 |
from utils.error.errno_utils import MessageStatusCode, UserStatusCode |
| 9 | 10 |
from utils.error.response_utils import response |
| 10 | 11 |
from utils.message_utils import system_messages, system_unread_messages |
| 11 |
-from utils.page_utils import pagination |
|
| 12 | 12 |
from utils.redis.rmessage import set_system_message_delete_info, set_system_message_read_info |
| 13 | 13 |
|
| 14 | 14 |
|
+ 1
- 1
pay/views.py
@@ -5,6 +5,7 @@ from django.conf import settings |
||
| 5 | 5 |
from django.db import transaction |
| 6 | 6 |
from django.shortcuts import HttpResponse |
| 7 | 7 |
from logit import logit |
| 8 |
+from paginator import pagination |
|
| 8 | 9 |
from TimeConvert import TimeConvert as tc |
| 9 | 10 |
from wechatpy import WeChatPay, WeChatPayException |
| 10 | 11 |
|
@@ -15,7 +16,6 @@ from photo.models import PhotosInfo |
||
| 15 | 16 |
from utils.error.errno_utils import (GroupPhotoStatusCode, OrderStatusCode, UserStatusCode, WechatStatusCode, |
| 16 | 17 |
WithdrawStatusCode) |
| 17 | 18 |
from utils.error.response_utils import response |
| 18 |
-from utils.page_utils import pagination |
|
| 19 | 19 |
from utils.redis.rbrief import set_brief_info |
| 20 | 20 |
from utils.redis.rorder import set_lensman_order_record |
| 21 | 21 |
|
+ 1
- 0
requirements.txt
@@ -13,6 +13,7 @@ django-ip==1.0.0 |
||
| 13 | 13 |
django-json-response==1.1.4 |
| 14 | 14 |
django-logit==1.0.6 |
| 15 | 15 |
django-multidomain==1.1.4 |
| 16 |
+django-paginator2==1.0.3 |
|
| 16 | 17 |
django-rlog==1.0.7 |
| 17 | 18 |
django-shortuuidfield==0.1.3 |
| 18 | 19 |
django-six==1.0.2 |
+ 0
- 17
utils/page_utils.py
@@ -1,17 +0,0 @@ |
||
| 1 |
-# -*- coding: utf-8 -*- |
|
| 2 |
- |
|
| 3 |
-from django.db.models.query import QuerySet |
|
| 4 |
- |
|
| 5 |
- |
|
| 6 |
-def pagination(queryset, page, num=10, strict=False): |
|
| 7 |
- """ |
|
| 8 |
- Simple Pagination Funciton |
|
| 9 |
- :param queryset: |
|
| 10 |
- :param page: |
|
| 11 |
- :param num: number per page |
|
| 12 |
- :param strict: strict left number or not |
|
| 13 |
- :return: matched query, left number(default not strict) |
|
| 14 |
- """ |
|
| 15 |
- start, end = num * (page - 1), num * page |
|
| 16 |
- return queryset[start: end], max(queryset.count() if isinstance(queryset, QuerySet) else len(queryset) - end, |
|
| 17 |
- 0) if strict else len(queryset[end: end + 1]) |