From e662df211520127310f208cb499ba589ed48b747 Mon Sep 17 00:00:00 2001 From: yangjian Date: Tue, 13 Apr 2021 21:05:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E6=A1=A3=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E7=A7=BB=E5=8A=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app_doc/views.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app_doc/views.py b/app_doc/views.py index dfef222..b7173cd 100644 --- a/app_doc/views.py +++ b/app_doc/views.py @@ -1338,7 +1338,8 @@ def move_doc(request): try: project = Project.objects.get(id=int(pro_id)) # 自己的文集 colla = ProjectCollaborator.objects.filter(project=project, user=request.user) # 协作文集 - if (project.create_user is not request.user) and (colla.count() == 0): # 请求者不是文集创建者和协作者返回错误 + if (project.create_user != request.user) and (colla.count() == 0) : # 文集创建者 + print(project.create_user,request.user,colla.count()) return JsonResponse({'status':False,'data':_('文集无权限')}) except ObjectDoesNotExist: return JsonResponse({'status':False,'data':_('文集不存在')}) @@ -1361,6 +1362,7 @@ def move_doc(request): content = doc.content, parent_doc = parent_id, top_doc = int(pro_id), + editor_mode = doc.editor_mode, create_user = request.user, create_time = datetime.datetime.now(), modify_time = datetime.datetime.now(),