From 694ecd5a489530fb1f9322d562fa5938110f9bef Mon Sep 17 00:00:00 2001 From: baoliang Date: Mon, 26 Oct 2020 08:56:41 +0800 Subject: [PATCH] add message --- polls/urls.py | 1 + polls/views/__init__.py | 2 +- .../views/__pycache__/__init__.cpython-38.pyc | Bin 1555 -> 1584 bytes polls/views/__pycache__/media.cpython-38.pyc | Bin 7405 -> 7630 bytes polls/views/__pycache__/notice.cpython-38.pyc | Bin 5206 -> 5492 bytes polls/views/media.py | 23 +++--- polls/views/notice.py | 66 +++++++++++------- 7 files changed, 57 insertions(+), 35 deletions(-) diff --git a/polls/urls.py b/polls/urls.py index 61801a9..df27fe8 100644 --- a/polls/urls.py +++ b/polls/urls.py @@ -28,6 +28,7 @@ urlpatterns = [ path('medias/update/', views.update_media, name='polls_update_media'), path('medias/list/', views.medias, name='polls_medias'), path('medias/my/', views.my_medias, name='polls_my_medias'), + path('medias/admin/change/', views.media_admin_change, name='polls_media_admin_change'), path('medias///', views.media_detail, name='polls_media_detail'), path('medias/delete/', views.delete_media, name='polls_delete_media'), diff --git a/polls/views/__init__.py b/polls/views/__init__.py index c2d4bc5..fe7304a 100644 --- a/polls/views/__init__.py +++ b/polls/views/__init__.py @@ -1,6 +1,6 @@ from .user import index, status_500, status_401, polls_login, send_code, register_step_one, register_step_two, password_recover_step_one, password_recover_step_two, reset_password from .notice import notices, notice_top, read_notice, pass_notice, reject_notice, detail_notice, unread_notice_count -from .media import medias, my_medias, create_media, update_media, media_detail, delete_media +from .media import medias, my_medias, create_media, update_media, media_detail, delete_media, media_admin_change from .news import news_list, news_top, news_detail from .monitor import monitor_statistics, monitor_result, media_statistics, city_ranking from .task import tasks, create_task, create_test_task, get_task diff --git a/polls/views/__pycache__/__init__.cpython-38.pyc b/polls/views/__pycache__/__init__.cpython-38.pyc index 029cb505c2bcc851190384013b0f8f6fec926ef4..103621d681d94be7fc7d9160cd21c82da8458e61 100644 GIT binary patch delta 421 zcmW-cOHRU26oz|AD+)9rghU0(tGtZ(0E#?itZ|?YOw5^(hBiRxX~}JgTX0GmjazVL z!UkLin{W&E^xovV|Noscxqjj&A-~9SObAXb^*R0B$_i_4&o_^lfeaH2!4R!1<{*a( zD42(Q=p?IvMJQqkN?3+6s-TAcz^Y&ss#t>>)}f9KXoNm$ZU2-zY(XomhgKUq&gn013a=wToFIDi2TVHoMtS>>3s@KW2sMd1DE!6 zw$Salx!XlP7`yfF#rIc!8vJZ8+UA?fGeP88LXKn<9ee3HoGYaAgaV-$U@v;QyW%D4 zWr9km&_tSZXS4RtB=wm$0|D`wgKM38XxbjXpuJ1N6)i{6bX|RJ@@rBpLYvSbXoPNn ZZ-GxJPy8=wm8`HdI|*)sC0H_e{{fJ9VjKVf delta 371 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, 4->5 + profiles = ReplyModel.objects.filter( + organization_id=notice.record_id) + if pass_value == '2': # 市级提交，1->2, 4->5 for p in profiles: if p.admin_status == 1: p.admin_status = 2 @@ -134,9 +146,9 @@ def pass_notice(request): p.save() admins = Userprofile.level1_admin() for a in admins: - Notice.create_reply_notice(a.user.id, notice.content, notice.app, notice.model, notice.field, notice.record_id, '3', '0') - return JsonResponse({'status': 'success', 'message': '申请已同意'}) - else: #省级提交 + Notice.create_reply_notice( + a.user.id, notice.content, notice.app, notice.model, notice.field, notice.record_id, '3', '0') + else: # 省级提交 for p in profiles: if p.admin_status == 5: p.admin_status = 0 @@ -144,6 +156,7 @@ def pass_notice(request): if p.admin_status == 2: p.admin_status = 3 p.save() + return JsonResponse({'status': 'success', 'message': '申请已同意'}) else: m = ReplyModel.objects.get(pk=notice.record_id) setattr(m, notice.field, notice.record_pass_value) @@ -154,11 +167,13 @@ def pass_notice(request): if pass_value == '2': admins = Userprofile.level1_admin() for a in admins: - Notice.create_reply_notice(a.user.id, notice.content, notice.app, notice.model, notice.field, notice.record_id, '3', '0') + Notice.create_reply_notice( + a.user.id, notice.content, notice.app, notice.model, notice.field, notice.record_id, '3', '0') if pass_value == '5': admins = Userprofile.level1_admin() for a in admins: - Notice.create_reply_notice(a.user.id, notice.content, notice.app, notice.model, notice.field, notice.record_id, '0', '3') + Notice.create_reply_notice( + a.user.id, notice.content, notice.app, notice.model, notice.field, notice.record_id, '0', '3') return JsonResponse({'status': 'success', 'message': '申请已同意'}) except ObjectDoesNotExist: return JsonResponse({'status': 'error', 'message': '通知ID错误'}) @@ -178,7 +193,8 @@ def reject_notice(request): ReplyModel = apps.get_model(notice.app, notice.model) if notice.model == 'Userprofile': reject_value = notice.record_reject_value - profiles = ReplyModel.objects.filter(organization_id=notice.record_id) + profiles = ReplyModel.objects.filter( + organization_id=notice.record_id) for p in profiles: if p.admin_status == 1 or p.admin_status == 2: p.admin_status = 0 @@ -206,5 +222,3 @@ def unread_notice_count(request): user_id = request.user.id count = Notice.objects.filter(user_id=user_id, is_read=False).count() return JsonResponse({'status': 'success', 'message': count}) - -