github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei

pull/6/head
ibuler 2015-04-16 15:13:45 +08:00
parent 0d1d64e83c 75c8e44575
commit 83938e10b2
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jasset/views.py
View File

@ -577,15 +577,28 @@ def idc_detail(request):
@require_super_user @require_super_user
def idc_del(request): def idc_del(request):
offset = request.GET.get('id', '') offset = request.GET.get('id', '')
default_idc = IDC.objects.get(id=1)
if offset == 'multi': if offset == 'multi':
len_list = request.POST.get("len_list") len_list = request.POST.get("len_list")
for i in range(int(len_list)): for i in range(int(len_list)):
key = "id_list[" + str(i) + "]" key = "id_list[" + str(i) + "]"
gid = request.POST.get(key) gid = request.POST.get(key)
IDC.objects.filter(id=gid).delete() idc = IDC.objects.filter(id=gid)
if idc:
idc_class = idc.first()
idc_class.asset_set.update(idc=default_idc)
idc.delete()
else:
return httperror(request, '删除失败, 没有这个IDC!')
else: else:
gid = int(offset) gid = int(offset)
IDC.objects.filter(id=gid).delete() idc = IDC.objects.filter(id=gid)
if idc:
idc_class = idc.first()
idc_class.asset_set.update(idc=default_idc)
idc.delete()
else:
return httperror(request, '删除失败, 没有这个IDC!')
return HttpResponseRedirect('/jasset/idc_list/') return HttpResponseRedirect('/jasset/idc_list/')
@ -761,12 +774,12 @@ def group_del(request):
for i in range(int(len_list)): for i in range(int(len_list)):
key = "id_list[" + str(i) + "]" key = "id_list[" + str(i) + "]"
gid = request.POST.get(key) gid = request.POST.get(key)
if not verify(request, asset_group=[gid]): if is_group_admin(request) and not verify(request, asset_group=[gid]):
return httperror(request, '删除失败, 您无权删除!') return httperror(request, '删除失败, 您无权删除!')
BisGroup.objects.filter(id=gid).delete() BisGroup.objects.filter(id=gid).delete()
else: else:
gid = int(offset) gid = int(offset)
if not verify(request, asset_group=[gid]): if is_group_admin(request) and not verify(request, asset_group=[gid]):
return httperror(request, '删除失败, 您无权删除!') return httperror(request, '删除失败, 您无权删除!')
BisGroup.objects.filter(id=gid).delete() BisGroup.objects.filter(id=gid).delete()
return HttpResponseRedirect('/jasset/group_list/') return HttpResponseRedirect('/jasset/group_list/')