Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver

0beb683c · ibuler · 6c10cf1a · b134c90b · 0beb683c
Commit 0beb683c authored Apr 23, 2015 by ibuler
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

log_online.html templates/jlog/log_online.html +2 -2

No files found.
--- a/templates/jlog/log_online.html
+++ b/templates/jlog/log_online.html
@@ -209,8 +209,8 @@
       $.ajax({
           type: "GET",
           url: g_url,
-           success: window.open("/jlog/log_list/online/", "_self"),
+           success: window.open("/jlog/log_list/online/", "_self")
-           error: window.open(g_url, "_self")
+//           error: window.open(g_url, "_self")
       });
 }