diff --git a/jasset/views.py b/jasset/views.py index 6515f2696..4a2836347 100644 --- a/jasset/views.py +++ b/jasset/views.py @@ -430,8 +430,7 @@ def host_del(request, offset): host_id = request.POST.get(key) db_host_delete(request, host_id) else: - host_id = int(offset) - db_host_delete(request, host_id) + db_host_delete(request, offset) return HttpResponseRedirect('/jasset/host_list/') diff --git a/jperm/views.py b/jperm/views.py index b307740e7..cfb54c70d 100644 --- a/jperm/views.py +++ b/jperm/views.py @@ -774,10 +774,9 @@ def get_apply_posts(request, status, username, dept_name, keyword=None): posts = post_all.filter(dept=dept_name) elif is_common_user(request): if keyword: - posts = post_keyword_all.filter(user=username) + posts = post_keyword_all.filter(applyer=username) else: - posts = post_all.filter(user=username) - + posts = post_all.filter(applyer=username) return posts diff --git a/jumpserver.conf b/jumpserver.conf index d08e6cc0b..c1e035757 100644 --- a/jumpserver.conf +++ b/jumpserver.conf @@ -1,7 +1,7 @@ #coding: utf8 [base] -ip = 192.168.0.129 +ip = 192.168.20.209 port = 80 key = 88aaaf7ffe3c6c04 diff --git a/static/img/admin.png b/static/img/admin.png index 701f897ae..0c7d8fb74 100644 Binary files a/static/img/admin.png and b/static/img/admin.png differ diff --git a/static/img/root.bak.png b/static/img/root.bak.png deleted file mode 100644 index 06291e7e0..000000000 Binary files a/static/img/root.bak.png and /dev/null differ diff --git a/templates/jasset/group_detail.html b/templates/jasset/group_detail.html index 14b7afde7..f05f996a6 100644 --- a/templates/jasset/group_detail.html +++ b/templates/jasset/group_detail.html @@ -31,6 +31,7 @@