Merge pull request #21 from shadowzey/master

页面错误修复

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 %}
+{% endblock %}
\ No newline at end of file

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 %}
+{% endblock %}
\ No newline at end of file