From be2f0b217264c29f37565d24d50e4ff1ffc30506 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 14 Dec 2015 16:54:49 +0800
Subject: [PATCH] fix log kill and asset detail bug

---
 templates/jasset/asset_add_batch.html |  1 -
 templates/jlog/log_online.html        |  4 +-
 templates/jperm/perm_rule_detail.html | 59 +++++++++++++--------------
 3 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/templates/jasset/asset_add_batch.html b/templates/jasset/asset_add_batch.html
index b3cab59c0..abc5993aa 100644
--- a/templates/jasset/asset_add_batch.html
+++ b/templates/jasset/asset_add_batch.html
@@ -51,7 +51,6 @@
                                         <input type="file" name="file_name" class="file" id="fileField" size="28" onchange="document.getElementById('textfield').value=this.value" />
                                         <button class="btn btn-primary btn-sm" type="submit">上传文件</button>
                                     </div>
-
                                 </form>
                             </div>
                         </div>
diff --git a/templates/jlog/log_online.html b/templates/jlog/log_online.html
index 4f6565a90..6f02de861 100644
--- a/templates/jlog/log_online.html
+++ b/templates/jlog/log_online.html
@@ -207,13 +207,13 @@
        if (login_type=='web'){
            var g_url = '{{ web_kill_uri }}' + '?id=' + num;
        } else {
-           var g_url = "/jlog/log_kill/?id=" + num;
+           var g_url = "{% url 'log_kill' %} }?id=" + num;
        }
 
        $.ajax({
            type: "GET",
            url: g_url+"&sessionid={{ session_id }}",
-           success: window.open("/jlog/log_list/online/", "_self")
+           success: window.open("{% url 'log_list' 'online' %}", "_self")
        });
 
 }
diff --git a/templates/jperm/perm_rule_detail.html b/templates/jperm/perm_rule_detail.html
index c099fd7e1..3ae78a4bf 100644
--- a/templates/jperm/perm_rule_detail.html
+++ b/templates/jperm/perm_rule_detail.html
@@ -83,36 +83,35 @@
                         </div>
                     </div>
                     <div class="ibox-content">
-                            <div class="text-center">
-                                <table class="table" id="agedit" >
-                                    <td class="text-navy text-left">用户</td>
-                                    <td class="text-navy text-right">用户组</td>
-                                    <tr>
-                                        <td>
-                                            <table class="table progress-striped text-left">
-                                            {% for user in users %}
-                                                <tr class="gradeX">
-                                                    <td> <a href="{% url 'asset_detail' %}?id={{ user.id }}">{{ user.name }}</a> </td>
-                                                </tr>
-                                            {% endfor %}
-                                            </table>
-                                        </td>
-                                        <td>
-                                            <table class="table progress-striped text-right">
-                                            {% for group in user_groups %}
-                                                <tr class="gradeX-">
-                                                    <td> <a href="{% url 'asset_list' %}?group_id={{ group.id }}">{{ group.name }}</a> </td>
-                                                </tr>
-                                            {% endfor %}
-                                            </table>
-                                        </td>
-
-                                    </tr>
-                                </table>
-                            </div>
-                    </div>
-                    </div>
+                        <div class="text-center">
+                            <table class="table" id="agedit" >
+                                <td class="text-navy text-left">用户</td>
+                                <td class="text-navy text-right">用户组</td>
+                                <tr>
+                                    <td>
+                                        <table class="table progress-striped text-left">
+                                        {% for user in users %}
+                                            <tr class="gradeX">
+                                                <td> <a href="{% url 'user_detail' %}?id={{ user.id }}">{{ user.name }}</a> </td>
+                                            </tr>
+                                        {% endfor %}
+                                        </table>
+                                    </td>
+                                    <td>
+                                        <table class="table progress-striped text-right">
+                                        {% for group in user_groups %}
+                                            <tr class="gradeX-">
+                                                <td> <a href="{% url 'user_group_list' %}?group_id={{ group.id }}">{{ group.name }}</a> </td>
+                                            </tr>
+                                        {% endfor %}
+                                        </table>
+                                    </td>
+                                </tr>
+                            </table>
+                        </div>
                     </div>
+                </div>
+            </div>
             <div class="col-sm-4">
                 <div class="ibox float-e-margins">
                     <div class="ibox-title">
@@ -145,7 +144,7 @@
                                             <table class="table progress-striped text-left">
                                             {% for asset in assets %}
                                                 <tr class="gradeX">
-                                                    <td> <a href="{% url 'asset_list' %}?id={{ asset.id }}">{{ asset.ip }}</a> </td>
+                                                    <td> <a href="{% url 'asset_detail' %}?id={{ asset.id }}">{{ asset.ip }}</a> </td>
                                                 </tr>
                                             {% endfor %}
                                             </table>