From d93f291978fb74808ab616fbc10b8bd92db2dc27 Mon Sep 17 00:00:00 2001 From: yangjian Date: Thu, 8 Apr 2021 22:05:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E5=A4=8D?= =?UTF-8?q?=E5=88=B6/=E7=A7=BB=E5=8A=A8=E6=96=87=E6=A1=A3=E5=88=B0?= =?UTF-8?q?=E5=8D=8F=E4=BD=9C=E6=96=87=E9=9B=86=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app_doc/views.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app_doc/views.py b/app_doc/views.py index 94002c3..9397151 100644 --- a/app_doc/views.py +++ b/app_doc/views.py @@ -957,11 +957,10 @@ def create_doc(request): if request.method == 'GET': # 获取url切换的编辑器模式 eid = request.GET.get('eid',editor_mode) - if eid in [1,2,3,'1','2','3']: + if eid in [1,2,3,4,'1','2','3','4']: editor_mode = int(eid) - try: - editor_type = _("新建文档") + editor_type = _("新建表格") if editor_mode == 4 else _("新建文档") pid = request.GET.get('pid',-999) project_list = Project.objects.filter(create_user=request.user) # 自己创建的文集列表 colla_project_list = ProjectCollaborator.objects.filter(user=request.user) # 协作的文集列表 @@ -1339,7 +1338,7 @@ 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()): # 请求者不是文集创建者和协作者返回错误 + if (project.create_user is not request.user) and (colla.count() == 0): # 请求者不是文集创建者和协作者返回错误 return JsonResponse({'status':False,'data':_('文集无权限')}) except ObjectDoesNotExist: return JsonResponse({'status':False,'data':_('文集不存在')})