Merge pull request #13 from ljjjustin/master

fix error url in host search page

jasset/views.py

@@ -232,7 +232,7 @@ def host_add_batch(request):
     active_types = {'激活': 1, '禁用': 0}
     dept_id = get_user_dept(request)
     if request.method == 'POST':
-        multi_hosts = request.POST.get('j_multi').split('\n')
+        multi_hosts = request.POST.get('j_multi').splitlines()
         for host in multi_hosts:
             if host == '':
                 break
@@ -927,4 +927,4 @@ def host_search(request):
         posts = list(set(post_all) & set(post_perm))
     contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
 
-    return my_render('jasset/host_search.html', locals(), request)
\ No newline at end of file
+    return my_render('jasset/host_search.html', locals(), request)

templates/jasset/host_search.html

@@ -35,7 +35,7 @@
             <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>
             <td class="text-center" data-editable='false'>
-                <a value="/jasset/{{ post.ip }}/" class="iframe btn btn-xs btn-primary">详情</a>
+                <a value="/jasset/host_detail/?id={{ post.id }}" class="iframe btn btn-xs btn-primary">详情</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>