From 10af0231de68f0b5f41c289fc43ccd954c5bfef0 Mon Sep 17 00:00:00 2001 From: yangjian Date: Fri, 4 Dec 2020 22:23:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=E6=97=B6?= =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E5=85=B6=E5=8D=8F=E4=BD=9C=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E7=BB=99=E6=96=87=E9=9B=86=E6=8B=A5=E6=9C=89=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app_admin/views.py | 12 ++++++++++-- template/app_admin/admin_user.html | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app_admin/views.py b/app_admin/views.py index d36baa4..162771e 100644 --- a/app_admin/views.py +++ b/app_admin/views.py @@ -347,8 +347,15 @@ def admin_change_pwd(request): def admin_del_user(request): if request.method == 'POST': try: - user_id = request.POST.get('user_id',None) - user = User.objects.get(id=int(user_id)) + user_id = request.POST.get('user_id',None) # 获取用户ID + user = User.objects.get(id=int(user_id)) # 获取用户 + colloas = ProjectCollaborator.objects.filter(user=user) # 获取参与协作的文集 + # 遍历用户参与协作的文集 + for colloa in colloas: + # 查询出用户协作创建的文档，修改作者为文集所有者 + Doc.objects.filter( + top_doc=colloa.project.id,create_user=user + ).update(create_user=colloa.project.create_user) user.delete() return JsonResponse({'status':True,'data':'删除成功'}) except Exception as e: @@ -623,6 +630,7 @@ def admin_register_code(request): else: return JsonResponse({'status': False,'data':'方法错误'}) + # 普通用户修改密码 @login_required() @logger.catch() diff --git a/template/app_admin/admin_user.html b/template/app_admin/admin_user.html index 6f4359a..36d6f43 100644 --- a/template/app_admin/admin_user.html +++ b/template/app_admin/admin_user.html @@ -194,7 +194,7 @@ title:'删除用户', area:'300px;', id:'delPro',//配置ID - content:'
警告：此操作将删除用户'+username+'及其所有文档！
', + content:'
警告：此操作将删除用户'+username+'及其文集文档！协作文档将转移给文集所有者
', btn:['确定','取消'], //添加按钮 btnAlign:'c', //按钮居中 yes:function (index,layero) {