github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix log kill and asset detail bug

pull/26/head
ibuler 2015-12-14 16:54:49 +08:00
parent 5e5aab7962
commit be2f0b2172
3 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
templates/jasset/asset_add_batch.html
View File

@ -51,7 +51,6 @@
<input type="file" name="file_name" class="file" id="fileField" size="28" onchange="document.getElementById('textfield').value=this.value" /> <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> <button class="btn btn-primary btn-sm" type="submit">上传文件</button>
</div> </div>
</form> </form>
</div> </div>
</div> </div>

4
templates/jlog/log_online.html
View File

@ -207,13 +207,13 @@
if (login_type=='web'){ if (login_type=='web'){
var g_url = '{{ web_kill_uri }}' + '?id=' + num; var g_url = '{{ web_kill_uri }}' + '?id=' + num;
} else { } else {
var g_url = "/jlog/log_kill/?id=" + num; var g_url = "{% url 'log_kill' %} }?id=" + num;
} }
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: g_url+"&sessionid={{ session_id }}", url: g_url+"&sessionid={{ session_id }}",
success: window.open("/jlog/log_list/online/", "_self") success: window.open("{% url 'log_list' 'online' %}", "_self")
}); });
} }

59
templates/jperm/perm_rule_detail.html
View File

@ -83,36 +83,35 @@
</div> </div>
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<div class="text-center"> <div class="text-center">
<table class="table" id="agedit" > <table class="table" id="agedit" >
<td class="text-navy text-left">用户</td> <td class="text-navy text-left">用户</td>
<td class="text-navy text-right">用户组</td> <td class="text-navy text-right">用户组</td>
<tr> <tr>
<td> <td>
<table class="table progress-striped text-left"> <table class="table progress-striped text-left">
{% for user in users %} {% for user in users %}
<tr class="gradeX"> <tr class="gradeX">
<td> <a href="{% url 'asset_detail' %}?id={{ user.id }}">{{ user.name }}</a> </td> <td> <a href="{% url 'user_detail' %}?id={{ user.id }}">{{ user.name }}</a> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
</td> </td>
<td> <td>
<table class="table progress-striped text-right"> <table class="table progress-striped text-right">
{% for group in user_groups %} {% for group in user_groups %}
<tr class="gradeX-"> <tr class="gradeX-">
<td> <a href="{% url 'asset_list' %}?group_id={{ group.id }}">{{ group.name }}</a> </td> <td> <a href="{% url 'user_group_list' %}?group_id={{ group.id }}">{{ group.name }}</a> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
</td> </td>
</tr>
</tr> </table>
</table> </div>
</div>
</div>
</div>
</div> </div>
</div>
</div>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="ibox float-e-margins"> <div class="ibox float-e-margins">
<div class="ibox-title"> <div class="ibox-title">
@ -145,7 +144,7 @@
<table class="table progress-striped text-left"> <table class="table progress-striped text-left">
{% for asset in assets %} {% for asset in assets %}
<tr class="gradeX"> <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> </tr>
{% endfor %} {% endfor %}
</table> </table>