Начало Разгледай Помощ
Регистриране Влизане
Pai2
/
pai2
Следи 2
Харесвам 0
Разклонение 0

Преглед на кода
change all param to cmp to string true

Brightcells преди 9 години
родител
165424743a
ревизия
a1bd97d641
променени са 1 файла, в които са добавени 8 реда и са изтрити 6 реда
Покажи статистика за разликите
  1. 8 6
      message/views.py

+ 8 - 6
message/views.py
Преглед на файла 

@@ -104,7 +104,7 @@ def message_type_read_api(request, msg_type=None):
104 104 
     """
105 105 
     user_id = request.POST.get('user_id', '') or request.GET.get('user_id', '')
106 106 
     pk = int(request.POST.get('pk', 0) or request.GET.get('pk', 0) or -1)
107 
-    _all = request.POST.get('all', '') or request.GET.get('all', '')
107 
+    _all = (request.POST.get('all', '') or request.GET.get('all', '')).lower()
108 108
109 109 
     # 用户校验
110 110 
     try:
 
@@ -112,18 +112,19 @@ def message_type_read_api(request, msg_type=None):
112 112 
     except UserInfo.DoesNotExist:
113 113 
         return response(UserStatusCode.USER_NOT_FOUND)
114 114
115 
+    # 消息读取
115 116 
     if msg_type == UserMessageInfo.SYSTEM:
116 117 
         if pk > 0:  # 系统消息单个读取
117 118 
             if not SystemMessageInfo.objects.filter(pk=pk).exists():
118 119 
                 return response(MessageStatusCode.MESSAGE_NOT_FOUND)
119 120 
             SystemMessageReadInfo.objects.get_or_create(user_id=user_id, msg_id=pk)
120 
-        if _all:  # 系统消息全部读取
121 
+        if _all == 'true':  # 系统消息全部读取
121 122 
             for msg in SystemMessageInfo.objects.filter(status=True):
122 123 
                 SystemMessageReadInfo.objects.get_or_create(user_id=user_id, msg_id=msg.pk)
123 124 
     else:
124 125 
         if pk > 0:  # 用户（点赞／评论）消息单个读取
125 126 
             UserMessageInfo.objects.filter(pk=pk, to_uid=user_id).update(read=True)
126 
-        if _all:  # 用户消息（点赞／评论）全部读取
127 
+        if _all == 'true':  # 用户消息（点赞／评论）全部读取
127 128 
             UserMessageInfo.objects.filter(to_uid=user_id, msg_type=msg_type).update(read=True)
128 129
129 130 
     return JsonResponse({
 
@@ -141,7 +142,7 @@ def message_type_delete_api(request, msg_type=None):
141 142 
     """
142 143 
     user_id = request.POST.get('user_id', '') or request.GET.get('user_id', '')
143 144 
     pk = int(request.POST.get('pk', 0) or request.GET.get('pk', 0) or -1)
144 
-    _all = request.POST.get('all', '') or request.GET.get('all', '')
145 
+    _all = (request.POST.get('all', '') or request.GET.get('all', '')).lower()
145 146
146 147 
     # 用户校验
147 148 
     try:
 
@@ -149,19 +150,20 @@ def message_type_delete_api(request, msg_type=None):
149 150 
     except UserInfo.DoesNotExist:
150 151 
         return response(UserStatusCode.USER_NOT_FOUND)
151 152
153 
+    # 消息删除
152 154 
     if msg_type == UserMessageInfo.SYSTEM:
153 155 
         if pk > 0:  # 系统消息单个删除
154 156 
             if not SystemMessageInfo.objects.filter(pk=pk).exists():
155 157 
                 return response(MessageStatusCode.MESSAGE_NOT_FOUND)
156 158 
             SystemMessageDeleteInfo.objects.get_or_create(user_id=user_id, msg_id=pk)
157 
-        if _all:  # 系统消息全部删除
159 
+        if _all == 'true':  # 系统消息全部删除
158 160 
             for msg in SystemMessageInfo.objects.filter(status=True):
159 161 
                 SystemMessageDeleteInfo.objects.get_or_create(user_id=user_id, msg_id=msg.pk)
160 162 
         set_system_message_delete_info(user_id)
161 163 
     else:
162 164 
         if pk > 0:  # 用户（点赞／评论）消息单个删除
163 165 
             UserMessageInfo.objects.filter(pk=pk, to_uid=user_id).update(status=False)
164 
-        if _all:  # 用户消息（点赞／评论）全部删除
166 
+        if _all == 'true':  # 用户消息（点赞／评论）全部删除
165 167 
             UserMessageInfo.objects.filter(to_uid=user_id, msg_type=msg_type).update(status=False)
166 168
167 169 
     return JsonResponse({