޸

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/')
 

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
 
 

jumpserver.conf

 #coding: utf8
 
 [base]
-ip = 192.168.0.129
+ip = 192.168.20.209
 port = 80
 key = 88aaaf7ffe3c6c04
 

templates/jasset/group_detail.html

@@ -31,6 +31,7 @@
                 <div class="ibox-content">
                     <div class="">
                         <a target="_blank" href="/jasset/host_add" class="btn btn-sm btn-primary"> 添加主机 </a>
+                        <b class="pull-right">提示: 此页面删除只从本主机组中剔除主机               </b>
                     </div>
 
                     <form id="contents_form" name="contents_form">