Skip to content

Commit ba6189f

Browse files
author
yangjian
committed
完成新建文档选择上级文档的功能
1 parent 12e1acf commit ba6189f

333 files changed

Lines changed: 58743 additions & 37 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dist/
1414
downloads/
1515
eggs/
1616
.eggs/
17-
lib/
17+
# lib/
1818
lib64/
1919
parts/
2020
sdist/
@@ -56,7 +56,7 @@ coverage.xml
5656
# Django stuff:
5757
*.log
5858
local_settings.py
59-
db.sqlite3
59+
# db.sqlite3
6060

6161
# Flask stuff:
6262
instance/

MrDoc/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
103103
},
104104
]
105-
105+
LOGIN_URL = 'login'
106106

107107
# Internationalization
108108
# https://docs.djangoproject.com/en/2.1/topics/i18n/

app_doc/urls.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
path('modify_doc/<int:doc_id>/', views.modify_doc, name="modify_doc"), # 修改文档
1616
path('del_doc/<int:doc_id>/',views.del_doc,name="del_doc"), # 删除文档
1717
#################文档模板相关
18+
path('manage_doctemp',views.manage_doctemp,name='manage_doctemp'), # 文档模板列表
1819
path('create_doctemp/',views.create_doctemp,name="create_doctemp"), # 创建文档模板
20+
path('get_doctemp/',views.get_doctemp,name='get_doctemp'), # 获取某一个文档模板内容
21+
path('del_doctemp/',views.del_doctemp,name="del_doctemp"), # 删除某一个文档模板
1922
################其他功能相关
2023
path('upload_doc_img/',util_upload_img.upload_img,name="upload_doc_img"), # 上传图片
2124
]

app_doc/views.py

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -198,20 +198,40 @@ def modify_doctemp(request,doctemp_id):
198198

199199
# 删除文档模板
200200
@login_required()
201-
def del_doctemp(request,doctemp_id):
202-
doctemp = DocTemp.objects.get(id=doctemp_id)
203-
if request.user.id == doctemp.create_user.id:
204-
doctemp.delete()
205-
return JsonResponse({'status':True,'data':'删除完成'})
201+
def del_doctemp(request):
202+
doctemp_id = request.POST.get('doctemp_id','')
203+
if doctemp_id != '':
204+
doctemp = DocTemp.objects.get(id=doctemp_id)
205+
if request.user.id == doctemp.create_user.id:
206+
doctemp.delete()
207+
return JsonResponse({'status':True,'data':'删除完成'})
208+
else:
209+
return JsonResponse({'status':False,'data':'非法请求'})
206210
else:
207-
return JsonResponse({'status':False,'data':'非法请求'})
211+
return JsonResponse({'status': False, 'data': '参数错误'})
208212

209213

210-
# 获取文档模板列表
214+
# 文档模板列表页 - (管理模板)
211215
@login_required()
212-
def get_doctemp_list(request):
213-
if request.method == 'POST':
216+
def manage_doctemp(request):
217+
if request.method == 'GET':
214218
doctemp_list = DocTemp.objects.filter(create_user=request.user)
219+
return render(request,'app_doc/doctemp_list.html',locals())
220+
# if request.method == 'POST':
221+
# doctemp_list = DocTemp.objects.filter(create_user=request.user)
222+
223+
# 获取指定文档模板
224+
@login_required()
225+
def get_doctemp(request):
226+
if request.method == 'POST':
227+
doctemp_id = request.POST.get('doctemp_id','')
228+
if doctemp_id != '':
229+
content = DocTemp.objects.get(id=int(doctemp_id)).serializable_value('content')
230+
return JsonResponse({'status':True,'data':content})
231+
else:
232+
return JsonResponse({'status':False,'data':'参数错误'})
233+
else:
234+
return JsonResponse({'status':False,'data':'方法错误'})
215235

216236

217237
# 获取指定文集的所有文档
@@ -220,9 +240,22 @@ def get_pro_doc(request):
220240
pro_id = request.POST.get('pro_id','')
221241
if pro_id != '':
222242
doc_list = Doc.objects.filter(top_doc=int(pro_id)).values_list('id','name','parent_doc').order_by('parent_doc')
223-
return JsonResponse({'status':True,'data':list(doc_list)})
243+
item_list = []
244+
for doc in doc_list:
245+
if doc[2] == 0:
246+
item = [
247+
doc[0],doc[1],doc[2],''
248+
]
249+
else:
250+
parent = Doc.objects.get(id=doc[2])
251+
if parent.parent_doc == 0: # 只要二级目录
252+
item = [
253+
doc[0],doc[1],doc[2],parent.name+' --> '
254+
]
255+
item_list.append(item)
256+
return JsonResponse({'status':True,'data':list(item_list)})
224257
else:
225258
return JsonResponse({'status':False,'data':'参数错误'})
226259
else:
227-
pass
260+
return JsonResponse({'status':False,'data':'方法错误'})
228261

db.sqlite3

340 KB
Binary file not shown.

0 commit comments

Comments
 (0)