From 7213c5c63738ed6913a73e90e2462ed1b038ef3e Mon Sep 17 00:00:00 2001 From: liuzheng712 Date: Thu, 25 Feb 2016 21:04:27 +0800 Subject: [PATCH 1/2] fix(log_online.html): log kill bug change $.ajax to $.get --- templates/jlog/log_online.html | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/templates/jlog/log_online.html b/templates/jlog/log_online.html index f82969156..14fec40ae 100644 --- a/templates/jlog/log_online.html +++ b/templates/jlog/log_online.html @@ -213,14 +213,11 @@ if (login_type=='web'){ var g_url = '{{ web_kill_uri }}' + '?id=' + num; } else { - 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 () { + window.open("{% url 'log_list' 'online' %}", "_self") + }) } From 4d5d56fe797fd4c174f694479e3d2bb93d6a3137 Mon Sep 17 00:00:00 2001 From: liuzheng712 Date: Thu, 25 Feb 2016 21:07:18 +0800 Subject: [PATCH 2/2] fix(jlog/views.py): kill bug, because cross domain --- jlog/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jlog/views.py b/jlog/views.py index e2565250e..61ab19ddc 100644 --- a/jlog/views.py +++ b/jlog/views.py @@ -67,7 +67,7 @@ def log_list(request, offset): contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request) 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 return render_to_response('jlog/log_%s.html' % offset, locals(), context_instance=RequestContext(request))