diff --git a/jasset/views.py b/jasset/views.py index a08b3430f..79c415cb3 100644 --- a/jasset/views.py +++ b/jasset/views.py @@ -60,7 +60,7 @@ def f_add_host(ip, port, idc, jtype, group, dept, active, comment, username='', def add_host(request): login_types = {'L': 'LDAP', 'M': 'MAP'} header_title, path1, path2 = u'添加主机', u'资产管理', u'添加主机' - eidc = IDC.objects.all() + eidc = IDC.objects.exclude(name='ALL') if is_super_user(request): edept = DEPT.objects.all() egroup = BisGroup.objects.exclude(name='ALL') diff --git a/templates/index.html b/templates/index.html index 14e55a745..f1d4cc6b8 100644 --- a/templates/index.html +++ b/templates/index.html @@ -7,7 +7,7 @@
- Monthly + Users
用户总数
@@ -20,7 +20,7 @@
- Annual + Hosts
主机总数
@@ -34,7 +34,7 @@
- Today + Online
实时在线用户
@@ -48,13 +48,13 @@
- Low value + Connected
已连接服务器

38%
- Connect host + Connected host
diff --git a/templates/jasset/jlist_ip.html b/templates/jasset/jlist_ip.html index e7ea87552..850e9cd9f 100644 --- a/templates/jasset/jlist_ip.html +++ b/templates/jasset/jlist_ip.html @@ -34,7 +34,7 @@ {{ post.port }} {{ login_types|get_item:post.login_type }} {{ post.idc.name }} - {% for group in post.bis_group.all|filter_private %} {{ group }} {% endfor %} + {% for group in post.bis_group.all %} {{ group }} {% endfor %} {{ post.date_added|date:"Y-m-d H:i:s" }} {{ post.comment }}