From 1b4908abacc1ffbed4212ec6fb8ad64a0a5b3bbd Mon Sep 17 00:00:00 2001 From: minhaz Date: Thu, 20 Feb 2014 21:50:16 +0530 Subject: [PATCH 1/3] Replication of bug #4292 in inline sql edit Signed-off-by: A V Minhaz --- js/functions.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/functions.js b/js/functions.js index 7663565a59..75c2c1e00e 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1389,6 +1389,8 @@ AJAX.registerOnload('functions.js', function () { }); $("input#sql_query_edit_save").live('click', function () { + $(".success").hide(); + //hide already existing success message var sql_query; if (codemirror_inline_editor) { sql_query = codemirror_inline_editor.getValue(); From e4ebdc9d63e3294728e0a9ecf58aa9d4ece23a5b Mon Sep 17 00:00:00 2001 From: minhaz Date: Thu, 20 Feb 2014 23:57:11 +0530 Subject: [PATCH 2/3] Bug fix 4293 Signed-off-by: A V Minhaz --- js/ajax.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/js/ajax.js b/js/ajax.js index 22265140e0..62c2402a6c 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -294,6 +294,13 @@ var AJAX = { } if (data._selflink) { + + var source = data._selflink.split('?')[0]; + //Check for faulty links + if (source == "import.php") { + var replacement = "tbl_sql.php"; + data._selflink = data._selflink.replace(source,replacement); + } $('#selflink > a').attr('href', data._selflink); } if (data._scripts) { From f63edbe26a8429afffb9fa2c51b73850103ae6b9 Mon Sep 17 00:00:00 2001 From: minhaz Date: Fri, 21 Feb 2014 00:01:33 +0530 Subject: [PATCH 3/3] coding style fix - for bug 4293 Signed-off-by: A V Minhaz --- js/ajax.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/ajax.js b/js/ajax.js index 62c2402a6c..303a6eea78 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -296,11 +296,11 @@ var AJAX = { if (data._selflink) { var source = data._selflink.split('?')[0]; - //Check for faulty links - if (source == "import.php") { - var replacement = "tbl_sql.php"; - data._selflink = data._selflink.replace(source,replacement); - } + //Check for faulty links + if (source == "import.php") { + var replacement = "tbl_sql.php"; + data._selflink = data._selflink.replace(source,replacement); + } $('#selflink > a').attr('href', data._selflink); } if (data._scripts) {