From df2c2fc7d5bb5f39d2fa79d0fc8e3029cc2c15bd Mon Sep 17 00:00:00 2001
From: halcyon <864072399@qq.com>
Date: Sat, 21 Mar 2015 12:58:29 +0800
Subject: [PATCH] zhoumo

---
 jasset/views.py                |  2 +-
 templates/index.html           | 10 +++++-----
 templates/jasset/jlist_ip.html |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

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 @@
         <div class="col-lg-3">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
-                    <span class="label label-success pull-right">Monthly</span>
+                    <span class="label label-success pull-right">Users</span>
                     <h5>用户总数</h5>
                 </div>
                 <div class="ibox-content">
@@ -20,7 +20,7 @@
         <div class="col-lg-3">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
-                    <span class="label label-info pull-right">Annual</span>
+                    <span class="label label-info pull-right">Hosts</span>
                     <h5>主机总数</h5>
                 </div>
                 <div class="ibox-content">
@@ -34,7 +34,7 @@
         <div class="col-lg-3">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
-                    <span class="label label-primary pull-right">Today</span>
+                    <span class="label label-primary pull-right">Online</span>
                     <h5>实时在线用户</h5>
                 </div>
                 <div class="ibox-content">
@@ -48,13 +48,13 @@
         <div class="col-lg-3">
             <div class="ibox float-e-margins">
                 <div class="ibox-title">
-                    <span class="label label-danger pull-right">Low value</span>
+                    <span class="label label-danger pull-right">Connected</span>
                     <h5>已连接服务器</h5>
                 </div>
                 <div class="ibox-content">
                         <h1 class="no-margins"><a href="/jlog/log_list/online/"> <span id="online_hosts"></span></a></h1>
                     <div class="stat-percent font-bold text-danger">38% <i class="fa fa-level-down"></i></div>
-                    <small>Connect host</small>
+                    <small>Connected host</small>
                 </div>
             </div>
         </div>
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 @@
                             <td> {{ post.port }} </td>
                             <td> {{ login_types|get_item:post.login_type }} </td>
                             <td class="text-center"> {{ post.idc.name }} </td>
-                            <td class="text-center">{% for group in post.bis_group.all|filter_private %} {{ group }} {% endfor %}</td>
+                            <td class="text-center">{% for group in post.bis_group.all %} {{ group }} {% endfor %}</td>
                             <td class="text-center"> {{ post.date_added|date:"Y-m-d H:i:s" }} </td>
                             <td class="text-center"> {{ post.comment }} </td>
                         </tr>