From d72d55c9653303511c4148fbde18fb3e4cc1799a Mon Sep 17 00:00:00 2001
From: guanghongwei <ibuler@qq.com>
Date: Sun, 8 Mar 2015 22:48:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=A1=E6=80=8E=E4=B9=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jumpserver.conf                 | 2 +-
 templates/jasset/host_list.html | 2 +-
 templates/juser/group_edit.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jumpserver.conf b/jumpserver.conf
index 9540fa014..a24c2190a 100644
--- a/jumpserver.conf
+++ b/jumpserver.conf
@@ -8,7 +8,7 @@ password = mysql234
 database = jumpserver
 
 [ldap]
-ldap_enable = 0
+ldap_enable = 1
 host_url = ldap://127.0.0.1:389
 base_dn = dc=jumpserver, dc=org
 root_dn = cn=admin,dc=jumpserver,dc=org
diff --git a/templates/jasset/host_list.html b/templates/jasset/host_list.html
index 5638342d8..805b03c72 100644
--- a/templates/jasset/host_list.html
+++ b/templates/jasset/host_list.html
@@ -68,7 +68,7 @@
                                 <td class="text-center" name="j_port"> {{ post.port }} </td>
                                 <td class="text-center" name="j_type"> {{ login_types|get_item:post.login_type }} </td>
                                 <td class="text-center" name="j_idc"> {{ post.idc.name }} </td>
-                                <td class="text-center" name="j_group">{% for group in post.bis_group.all|filter_private %} {{ group }} {% endfor %}</td>
+                                <td class="text-center" name="j_group">{{ post.bis_group.all | group_str2}}</td>
                                 <td class="text-center" name="j_active"> {{ post.is_active|bool2str }} </td>
                                 <td class="text-center"> {{ post.date_added|date:"Y-m-d H:i:s" }} </td>
                                 <td class="text-center" name="j_comment"> {{ post.comment }} </td>
diff --git a/templates/juser/group_edit.html b/templates/juser/group_edit.html
index 9f9b724c1..e565fc5b2 100644
--- a/templates/juser/group_edit.html
+++ b/templates/juser/group_edit.html
@@ -37,7 +37,7 @@
                             <div class="form-group">
                                 <label for="group_name" class="col-sm-2 control-label">组名<span class="red-fonts">*</span></label>
                                 <div class="col-sm-8">
-                                    <input name="group_id" type="text" class="form-control" value="{{ group.id }}">
+                                    <input name="group_id" type="text" class="form-control" value="{{ group.id }}" style="display: none">
                                     <input id="group_name" name="group_name" placeholder="Group name" type="text" class="form-control" value="{{ group.name }}">
                                 </div>
                             </div>