diff --git a/jasset/views.py b/jasset/views.py index a62aaca00..1e9fcb9ef 100644 --- a/jasset/views.py +++ b/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) \ No newline at end of file diff --git a/jlog/views.py b/jlog/views.py index 85a937028..29fc3e38d 100644 --- a/jlog/views.py +++ b/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: diff --git a/jperm/views.py b/jperm/views.py index d6d6bf2c3..57559444e 100644 --- a/jperm/views.py +++ b/jperm/views.py @@ -634,7 +634,7 @@ def perm_apply(request): """ 权限申请 """ header_title, path1, path2 = u'主机权限申请', u'权限管理', u'申请主机' user_id, username = get_session_user_info(request)[0:2] - name = User.objects.get(id=user_id).name + name = User.objects.get(id=user_id).username dept_id, deptname, dept = get_session_user_info(request)[3:6] perm_host = user_perm_asset_api(username) all_host = Asset.objects.filter(dept=dept) diff --git a/jumpserver/api.py b/jumpserver/api.py index 7c416925a..50461810e 100644 --- a/jumpserver/api.py +++ b/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] diff --git a/log_handler.py b/log_handler.py index 025d81ff4..199afe1cb 100644 --- a/log_handler.py +++ b/log_handler.py @@ -66,7 +66,6 @@ def run(): log_hanler(pid_id) for pid_id, pid, log_path, is_finished, log_finished, start_time in pids1: - print pid_id, start_time, type(start_time) try: file_time = int(os.stat(log_path).st_ctime) now_time = int(time.time())