diff --git a/CHANGES.md b/CHANGES.md index 1b367a4..c85f1d4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,10 @@ ## 版本更新记录 +### v0.6.8 2021-06 + +- [新增]文档页面支持OGP协议; +- [优化]用户禁止同名文集创建,文集下禁止同名文档创建; + ### v0.6.7 2021-05-29 - [新增]表格文档支持Excel文件(.xlsx格式)导入; - [新增]后台管理用户管理的用户资料修改功能; diff --git a/app_doc/views.py b/app_doc/views.py index 62284c8..2bf89d3 100644 --- a/app_doc/views.py +++ b/app_doc/views.py @@ -304,6 +304,9 @@ def create_project(request): role = request.POST.get('role',0) role_list = ['0','1','2','3',0,1,2,3] if name != '': + # 不允许用户下同名文集存在 + if Project.objects.filter(name=name,create_user=request.user).exists(): + return JsonResponse({'status': False, 'data': _('同名文集已存在!')}) project = Project.objects.create( name=validateTitle(name), icon = icon, @@ -1006,6 +1009,9 @@ def create_doc(request): check_project = Project.objects.filter(id=project,create_user=request.user) colla_project = ProjectCollaborator.objects.filter(project=project,user=request.user) if check_project.count() > 0 or colla_project.count() > 0: + # 判断文集下是否存在同名文档 + if Doc.objects.filter(name=doc_name,top_doc=int(project)).exists(): + return JsonResponse({'status':False,'data':_('文集内不允许同名文档')}) # 开启事务 with transaction.atomic(): save_id = transaction.savepoint() diff --git a/template/app_doc/pro_list.html b/template/app_doc/pro_list.html index c8a8627..819bb03 100644 --- a/template/app_doc/pro_list.html +++ b/template/app_doc/pro_list.html @@ -358,7 +358,7 @@ window.location.reload(); }else{ //创建失败,提示 - console.log(r) + // console.log(r) layer.closeAll('loading') layer.msg(r.data) } @@ -386,7 +386,7 @@ window.location.href = '/create_doc/?pid=' + r.data.id; }else{ //创建失败,提示 - console.log(r) + // console.log(r) layer.closeAll('loading') layer.msg(r.data) }