Fix Bug: user's outtake_status error

Brightcells лет %!s(int64=7): %!d(string=назад)
Родитель
Сommit
8c02eb6452
2 измененных файлов с 6 добавлено и 5 удалено
  1. 4 3
      account/admin.py
  2. 2 2
      requirements.txt

+ 4 - 3
account/admin.py

@@ -13,7 +13,7 @@ class LensmanInfoAdmin(admin.ModelAdmin):
13 13
     list_display = ('lensman_id', 'unionid', 'username', 'name', 'sex', 'phone', 'location', 'proportion', 'nomark', 'origin', 'balance', 'user_status', 'outtake_status', 'status', 'created_at', 'updated_at')
14 14
     list_filter = ('is_common_lensman', 'is_outtake_lensman', 'sex', 'user_status', 'outtake_status', 'status')
15 15
     readonly_fields = ('lensman_id', )
16
-    search_fields = ('name', 'phone', 'location')
16
+    search_fields = ('lensman_id', 'name', 'phone', 'location')
17 17
 
18 18
     @transaction.atomic
19 19
     def save_model(self, request, obj, form, change):
@@ -35,6 +35,7 @@ class LensmanInfoAdmin(admin.ModelAdmin):
35 35
             'location': obj.location,
36 36
             'islensman': True,
37 37
             'user_status': obj.user_status,
38
+            'outtake_status': obj.outtake_status,
38 39
             'is_common_lensman': obj.is_common_lensman,
39 40
             'is_outtake_lensman': obj.is_outtake_lensman,
40 41
         }
@@ -61,7 +62,7 @@ class TourGuideInfoAdmin(admin.ModelAdmin):
61 62
     list_display = ('tourguide_id', 'unionid', 'name', 'sex', 'phone', 'location', 'no', 'user_status', 'status', 'created_at', 'updated_at')
62 63
     list_filter = ('sex', 'user_status', 'status')
63 64
     readonly_fields = ('tourguide_id', )
64
-    search_fields = ('name', 'phone', 'location', 'no')
65
+    search_fields = ('tourguide_id', 'name', 'phone', 'location', 'no')
65 66
 
66 67
     @transaction.atomic
67 68
     def save_model(self, request, obj, form, change):
@@ -98,7 +99,7 @@ class UserInfoAdmin(admin.ModelAdmin):
98 99
     list_display = ('user_id', 'user_from', 'username', 'openid', 'unionid', 'name', 'sex', 'nickname', 'phone', 'location', 'islensman', 'istourguide', 'balance', 'user_status', 'outtake_status', 'status', 'created_at', 'updated_at')
99 100
     list_filter = ('user_from', 'sex', 'islensman', 'istourguide', 'user_status', 'outtake_status', 'status')
100 101
     readonly_fields = ('user_id', )
101
-    search_fields = ('name', 'phone', 'location')
102
+    search_fields = ('user_id', 'name', 'phone', 'location')
102 103
 
103 104
 
104 105
 class UserLoginLogInfoAdmin(admin.ModelAdmin):

+ 2 - 2
requirements.txt

@@ -20,7 +20,7 @@ django-rlog==1.0.7
20 20
 django-shortuuidfield==0.1.3
21 21
 django-six==1.0.2
22 22
 django-uniapi==1.0.0
23
-django-we==1.0.12
23
+django-we==1.0.13
24 24
 djangorestframework==3.6.3
25 25
 furl==1.0.1
26 26
 hiredis==0.2.0
@@ -32,7 +32,7 @@ pysnippets==1.0.4
32 32
 pywe-jssdk==1.0.2
33 33
 pywe-miniapp==1.0.0
34 34
 pywe-oauth==1.0.5
35
-pywe-pay==1.0.7
35
+pywe-pay==1.0.11
36 36
 pywe-pay-notify==1.0.1
37 37
 pywe-response==1.0.1
38 38
 pywe-sign==1.0.6