From a0429a872c31231de7959d3db72491e4cb42a0b6 Mon Sep 17 00:00:00 2001 From: Umair Khan Date: Mon, 3 Mar 2014 22:17:11 +0530 Subject: [PATCH 1/4] #4308 Stop edit routine form being submitted with enter Signed-off-by: Umair Khan --- js/rte.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/rte.js b/js/rte.js index 205439b441..c42bd97ef3 100644 --- a/js/rte.js +++ b/js/rte.js @@ -714,7 +714,7 @@ RTE.ROUTINE = { /* * Define the function if the user presses enter */ - $('form.rte_form').live('keyup', function (event) { + $('form.rte_form').on('keyup', function (event) { event.preventDefault(); if (event.keyCode === 13) { /** @@ -730,6 +730,7 @@ RTE.ROUTINE = { // Routine executed successfully PMA_ajaxRemoveMessage($msg); PMA_slidingMessage(data.message); + $('form.rte_form').off('keyup'); $ajaxDialog.remove(); } else { PMA_ajaxShowMessage(data.error, false); From ef959d182fccca51e3b3dc20b19c3a4b4e57a9fa Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 3 Mar 2014 15:04:24 -0500 Subject: [PATCH 2/4] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 100ea6abf8..ce5e85fbab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog - bug #4298 Missing validation on Import CSV: "Columns enclosed with" and "Columns escaped with" - bug #4040 Fatal error while resetting settings - bug #4305 JS error when editing procedure from nav panel +- bug #4308 Edit routine form submitting when pressing enter 4.1.8.0 (2014-02-22) - bug #4276 Login loop on session expiry From 5e2023ce772fe5de845a899e997b620a4c09ccfe Mon Sep 17 00:00:00 2001 From: Smita Kumari Date: Tue, 4 Mar 2014 02:25:18 +0530 Subject: [PATCH 3/4] Fix bug#4307 Nav: "Columns" wont expand with specific schema Signed-off-by: Smita Kumari --- libraries/navigation/NavigationTree.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php index 710262374e..2d8e0ae996 100644 --- a/libraries/navigation/NavigationTree.class.php +++ b/libraries/navigation/NavigationTree.class.php @@ -807,6 +807,7 @@ class PMA_NavigationTree } if ($node->is_group || (! in_array($parentName, $sterile) && ! $node->isNew) + || (in_array($node->real_name, $sterile)) //if node name itself is in sterile, then allow ) { $loaded = ''; if ($node->is_group) { From 1101b2156840f9056cf4cea9827d750fc3768926 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Tue, 4 Mar 2014 17:50:12 +0530 Subject: [PATCH 4/4] changelog entry for 4307 Signed-off-by: Atul Pratap Singh --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index ce5e85fbab..cc2c1201a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog - bug #4040 Fatal error while resetting settings - bug #4305 JS error when editing procedure from nav panel - bug #4308 Edit routine form submitting when pressing enter +- bug #4307 Nav: "Columns" won't expand with specific schema 4.1.8.0 (2014-02-22) - bug #4276 Login loop on session expiry