From 64973e43deebdef790ec7a8aaa1b150a8a55618d Mon Sep 17 00:00:00 2001
From: shadowzey <yanze000@hotmail.com>
Date: Tue, 13 Oct 2015 17:19:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=8E=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E9=83=A8=E9=97=A8=E9=A1=B5=E9=9D=A2=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E4=B8=BB=E6=9C=BA=E5=88=97=E8=A1=A8=E7=82=B9=E5=87=BB=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85404=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/jasset/host_list_nop.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/jasset/host_list_nop.html b/templates/jasset/host_list_nop.html
index eb1e3dd34..9f61bfbd5 100644
--- a/templates/jasset/host_list_nop.html
+++ b/templates/jasset/host_list_nop.html
@@ -73,7 +73,7 @@
                                 <td class="text-center" name="j_active"> {{ post.is_active|bool2str }} </td>
                                 <td class="text-center" name="j_comment"> {{ post.comment }} </td>
                                 <td class="text-center" data-editable='false'>
-                                    <a value="/jasset/{{ post.ip }}/" class="iframe btn btn-xs btn-primary">详情</a>
+                                    <a href="/jasset/host_detail/?id={{ post.id }}" class="btn btn-xs btn-info">详情</a>
                                     {% ifnotequal session_role_id 0 %}
                                         <a href="/jasset/host_edit/?id={{ post.id }}" class="btn btn-xs btn-info">编辑</a>
                                         <a href="/jasset/host_del/{{ post.id }}" class="btn btn-xs btn-danger">删除</a>
@@ -174,4 +174,4 @@
 
 </script>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From ec8ef4d1d76aab30aacb7d9e7c733e5bea3f2a86 Mon Sep 17 00:00:00 2001
From: zyan <shadowzey@users.noreply.github.com>
Date: Mon, 26 Oct 2015 10:35:50 +0800
Subject: [PATCH 2/2] Update idc_detail.html
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复IDC详情页面显示错误
---
 templates/jasset/idc_detail.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/jasset/idc_detail.html b/templates/jasset/idc_detail.html
index acc072590..643491c16 100644
--- a/templates/jasset/idc_detail.html
+++ b/templates/jasset/idc_detail.html
@@ -48,7 +48,7 @@
                                 <th class="text-center"> 端口号 </th>
                                 <th class="text-center" name="j_type"> 登录方式 </th>
                                 <th class="text-center" id="j_group_name" value="{{ idc_name }}"> 所属IDC </th>
-                                <th class="text-center"> 所属业务组 </th>
+                                <th class="text-center"> 所属部门 </th>
                                  <th class="text-center"> 是否激活 </th>
                                 <th class="text-center" name="j_time"> 添加时间 </th>
                                 <th class="text-center" name="j_comment"> 备注 </th>
@@ -64,8 +64,8 @@
                                 <td class="text-center" name="j_type"> {{ post.login_type|get_login_type }} </td>
                                 <td class="text-center" name="j_idc"> {{ post.idc.name }} </td>
                                 <td class="text-center" name="j_dept">{{ post.dept.all | group_str2 }}</td>
-                                <td class="text-center" name="j_group">{{ post.bis_group.all | group_str2_all }}</td>
                                 <td class="text-center" name="j_active"> {{ post.is_active|bool2str }} </td>
+                                <td class="text-center" name="j_dateadded"> {{ post.date_added }} </td>
                                 <td class="text-center" name="j_comment"> {{ post.comment }} </td>
                                 <td class="text-center" data-editable='false'>
                                     <a href="/jasset/host_detail/?id={{ post.id }}" class="btn btn-xs btn-primary">详情</a>
@@ -208,4 +208,4 @@
     }
 </script>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}