Browse Source

解决django低版本不支持first()问题

pull/6/head
halcyon 10 years ago
parent
commit
27d6df7a38
  1. 13
      jasset/views.py
  2. 4
      jlog/views.py
  3. 2
      jumpserver/api.py

13
jasset/views.py

@ -167,7 +167,7 @@ def db_idc_delete(request, idc_id):
idc = IDC.objects.filter(id=idc_id)
if idc:
idc_class = idc.first()
idc_class = idc[0]
idc_class.asset_set.update(idc=default_idc)
idc.delete()
else:
@ -330,7 +330,7 @@ def host_edit_common_batch(request):
asset_alias.save()
else:
AssetAlias.objects.create(user=u, host=a, alias=j_alias)
return my_render('jasset/host_list_common.html')
return my_render('jasset/host_list_common.html', locals(), request)
@require_login
@ -539,7 +539,7 @@ def host_detail(request):
post = Asset.objects.filter(id=host_id)
if not post:
return httperror(request, '没有此主机!')
post = post.first()
post = post[0]
if is_group_admin(request) and not validate(request, asset=[host_id]):
return httperror(request, '您无权查看!')
@ -697,7 +697,7 @@ def group_add(request):
pass
else:
j_dept = DEPT.objects.filter(id=j_dept).first()
j_dept = DEPT.objects.filter(id=j_dept)[0]
group = BisGroup.objects.create(name=j_group, dept=j_dept, comment=j_comment)
for host in j_hosts:
g = Asset.objects.get(id=host)
@ -772,7 +772,7 @@ def group_edit(request):
group_id = request.GET.get('id', '')
group = BisGroup.objects.filter(id=group_id)
if group:
group = group.first()
group = group[0]
else:
httperror(request, u'没有这个主机组!')
@ -918,10 +918,9 @@ def host_search(request):
posts = post_all.filter(dept=dept)
elif is_common_user(request):
username = get_session_user_info(request)[2]
user_id, username = get_session_user_info(request)[0:2]
post_perm = user_perm_asset_api(username)
posts = list(set(post_all) & set(post_perm))
contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
return my_render('jasset/host_search.html', locals(), request)

4
jlog/views.py

@ -71,7 +71,7 @@ def log_kill(request):
pid = request.GET.get('id', '')
log = Log.objects.filter(pid=pid)
if log:
log = log.first()
log = log[0]
dept_name = log.dept_name
deptname = get_session_user_info(request)[4]
if is_group_admin(request) and dept_name != deptname:
@ -89,7 +89,7 @@ def log_history(request):
log_id = request.GET.get('id', 0)
log = Log.objects.filter(id=int(log_id))
if log:
log = log.first()
log = log[0]
dept_name = log.dept_name
deptname = get_session_user_info(request)[4]
if is_group_admin(request) and dept_name != deptname:

2
jumpserver/api.py

@ -254,7 +254,7 @@ def get_session_user_info(request):
user_id = request.session.get('user_id', 0)
user = User.objects.filter(id=user_id)
if user:
user = user.first()
user = user[0]
dept = user.dept
return [user.id, user.username, user, dept.id, dept.name, dept]

Loading…
Cancel
Save