mirror of https://github.com/jumpserver/jumpserver
merge
commit
5fb5c1bb40
|
@ -67,7 +67,7 @@ def log_list(request, offset):
|
||||||
contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
|
contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
|
||||||
|
|
||||||
web_monitor_uri = '%s/monitor' % WEB_SOCKET_HOST
|
web_monitor_uri = '%s/monitor' % WEB_SOCKET_HOST
|
||||||
web_kill_uri = 'http://%s/kill' % WEB_SOCKET_HOST
|
web_kill_uri = '/kill'
|
||||||
session_id = request.session.session_key
|
session_id = request.session.session_key
|
||||||
return render_to_response('jlog/log_%s.html' % offset, locals(), context_instance=RequestContext(request))
|
return render_to_response('jlog/log_%s.html' % offset, locals(), context_instance=RequestContext(request))
|
||||||
|
|
||||||
|
|
|
@ -216,11 +216,6 @@
|
||||||
var g_url = "{% url 'log_kill' %}?id=" + num;
|
var g_url = "{% url 'log_kill' %}?id=" + num;
|
||||||
}
|
}
|
||||||
|
|
||||||
{# $.ajax({#}
|
|
||||||
{# type: "GET",#}
|
|
||||||
{# url: g_url+"&sessionid={{ session_id }}",#}
|
|
||||||
{# success: window.open("{% url 'log_list' 'online' %}", "_self")#}
|
|
||||||
{# });#}
|
|
||||||
$.get(g_url+"&sessionid={{ session_id }}", function () {
|
$.get(g_url+"&sessionid={{ session_id }}", function () {
|
||||||
window.open("{% url 'log_list' 'online' %}", "_self")
|
window.open("{% url 'log_list' 'online' %}", "_self")
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue