From a121532ae358644d6384240f6445342b499a034f Mon Sep 17 00:00:00 2001
From: yangjian <3280350050@qq.com>
Date: Mon, 29 Jul 2019 14:31:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=A0=E9=99=A4=E6=96=87?=
 =?UTF-8?q?=E9=9B=86=E9=80=BB=E8=BE=91=E5=92=8C=E5=88=A0=E9=99=A4=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app_admin/urls.py                  |   3 ++-
 app_doc/views.py                   |   6 +++++-
 db.sqlite3                         | Bin 348160 -> 348160 bytes
 template/app_admin/admin_user.html |  30 ++++++++++++++++++++++++++++-
 4 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/app_admin/urls.py b/app_admin/urls.py
index 9980227..37c5601 100644
--- a/app_admin/urls.py
+++ b/app_admin/urls.py
@@ -6,7 +6,8 @@ urlpatterns = [
     path('logout/',views.log_out,name='logout'),# 注销
     path('register/',views.register,name="register"), # 注册
     path('user_manage/',views.admin_user,name="user_manage"), # 用户管理
-    path('create/',views.admin_create_user,name="create_user"), # 新建用户
+    path('create_user/',views.admin_create_user,name="create_user"), # 新建用户
+    path('del_user/',views.admin_del_user,name='del_user'), # 删除用户
     path('project_manage/',views.admin_project,name='project_manage'), # 文集管理
     path('doc_manage/',views.admin_doc,name='doc_manage'), # 文集管理
     path('doctemp_manage/',views.admin_doctemp,name='doctemp_manage'), # 文集管理
diff --git a/app_doc/views.py b/app_doc/views.py
index a1eb364..a111c1a 100644
--- a/app_doc/views.py
+++ b/app_doc/views.py
@@ -92,6 +92,10 @@ def del_project(request):
         if pro_id != '':
             pro = Project.objects.get(id=pro_id)
             if request.user == pro.create_user:
+                # 删除文集下的文档
+                pro_doc_list = Doc.objects.filter(top_doc=int(pro_id))
+                pro_doc_list.delete()
+                # 删除文集
                 pro.delete()
                 return JsonResponse({'status':True})
             else:
@@ -169,7 +173,7 @@ def create_doc(request):
                     sort = sort if sort != '' else 99,
                     create_user=request.user
                 )
-                return JsonResponse({'status':True,'data':'创建成功'})
+                return JsonResponse({'status':True,'data':doc.id})
             else:
                 return JsonResponse({'status':False,'data':'参数错误'})
         except Exception as e:
diff --git a/db.sqlite3 b/db.sqlite3
index c5723899c80888c563be930881957d829f0383bd..17f65189e1f14821a20685a1a0765387b951c73f 100644
GIT binary patch
delta 686
zcmZozAlk4%bb>S^-$WT_M!t;+OZs`3_|7r#NAsQIbK_mQSy5pIFXO_=E9cH-VPIhB
z*z7gWfHBg@00>mdD>H*jyz)&eO;deTvXgz2%9C=^D$1(zqsn~!eBC?}wVnMklYBjc
zDxv~BDoYFfj4O*wDgq*HjSLJebq&mQjVu)mOsx!!txU}IOf3uyEDa}Lo^Qy*#Q&Os
z|2zL{5Zo--aGIZ+t0c9!#0ca7&dtx(%NdApus&emJH*Yw+rlo#d5Y77$Bp&DW=DY&
ztg%hj0<69*td80F8A&BoRT(K|W=ZKu6{U&E<{8CChG{t^xf!OJDP_JP$;SRJ+2xT{
zURi!wfkwXWzLk+xj;2vAzDB;`p~iky$wt0aVHuG|fyTbMVVP0kZrT2m<=^)O8$@R1
zWCOJtM7g_GMY%*)`h`bjM}=e?_=ludL}n!e#nO!<!y`?6vmC2@v$Bn%T(S*4^9-Qg
zw$L>+LiV<)sio0ox#zPORe=s~B<S$TcVD;(A{$_CVqj^o+2rMgZ+sklHyQZ1^H1XU
z;Lqi|xn1A^<8eM!6=q*XLV+Q${ogxAHbxN+eohAdNBph)hxya^m+-suYw&XdQ@}^Q
z=^FnTd4-UzwE($WU^`I!jsh1mZxaLme0~SsrtN$ROjCIoi>5EpWzrXg#IL25k%gX#
zxv8<aB?ALv%=Q<$Op;1$z{q6g|FoSwfayBFB#<M?4kSd_SeQ8(SwRE`h+uF39?t~C
M%-g@mvv7U@0N!KIc>n+a

delta 423
zcmZozAlk4%bb>S^>qHr6M%Il9OZs_Oc$YHpNAsQIbK_mQSy5psFH55w3-9EWbLX-&
zvNH2-_L^tF7-?z%1S-xYCL!*r86Fh@W_c=U$+_+s;a<K$h5>m|t|fjU1s0*%mfC*V
z>0So;fhqbCX*tfWA-)ElWr4Ov28Ncp2Ijg(777N2RtBb4#>RRU#^z=wmXj~fH{@aA
zzrn!&o&OR44gS}g1shKA^KmkZGnS+lml&~dFpDy7ezsoDK!}}Pj)CtGHwSMEyBy~!
zP7@xt&5i;b?3?AD&thcZXZ3BI?DIxx^1T<Xf`$lN%q=X;Elf6>yu9#Dh@I~r1OImZ
zN&FuCx%|p}|M>3!{riG%`@eULY>Yze{2B~EC$#b(=1=2a!tc(nv02eTh<`fge@5Qz
zrvDkwD{!&$HZkze=Xc<{y`4{iX(}&c>hvYLO!}h63Wi2jCgxT~mU;$8#)f8=3=9k#
zx4+P3l2l^jf6Tzje{VZ`0Mm7TNfu^KMs}bi7aNGh3L-c_1atfMcqSlb-u^wFh4TXd
D@R@c~

diff --git a/template/app_admin/admin_user.html b/template/app_admin/admin_user.html
index 4b03d58..18092f3 100644
--- a/template/app_admin/admin_user.html
+++ b/template/app_admin/admin_user.html
@@ -50,7 +50,7 @@
     <script type="text/html" id="userOpera">
       {% verbatim %}
       <a class="layui-table-link" href="javascript:void(0);" onclick="changePwd('{{ d.id }}','{{ d.username }}')">修改密码</a>&nbsp;&nbsp;
-      <a class="layui-table-link" href="javascript:void(0);" onclick="delUser('{{ d.id }}')">删除用户</a>
+      <a class="layui-table-link" href="javascript:void(0);" onclick="delUser('{{ d.id }}','{{ d.username }}')">删除用户</a>
       {% endverbatim %}
     </script>
 <script>
@@ -123,6 +123,34 @@
             btn:['确认修改','取消'],
         })
     };
+    //删除用户
+    delUser = function(uid,username){
+        layer.open({
+            type:1,
+            title:'删除用户',
+            area:'300px;',
+            id:'delPro',//配置ID
+            content:'<div style="margin-left:10px;">警告：此操作将删除用户'+username+'及其所有文档！</div>',
+            btn:['确定','取消'], //添加按钮
+            btnAlign:'c', //按钮居中
+            yes:function (index,layero) {
+                data = {
+                    'user_id':uid,
+                }
+                $.post("{% url 'del_user' %}",data,function(r){
+                    if(r.status){
+                        //删除成功
+                        window.location.reload();
+                        //layer.close(index)
+                    }else{
+                        //删除失败，提示
+                        //console.log(r)
+                        layer.msg(r.data)
+                    }
+                })
+            },
+        });
+    };
     //页面加载执行 获取所有用户信息
     getUserInfo();