From b39933c37b8cce0d9467f60bdfaae4a72d520893 Mon Sep 17 00:00:00 2001 From: Daniyal Shahid Date: Fri, 6 Mar 2015 00:34:37 +0500 Subject: [PATCH 1/2] Fix for #4788 Signed-off-by: Daniyal Shahid daniyal36@gmail.com Added a top margin to the datepicker after a certain window height so that null checkbox is visible --- js/makegrid.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/js/makegrid.js b/js/makegrid.js index ff03f10e7d..0934841e8a 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -1026,6 +1026,12 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $input_field.datepicker("show"); + var datepicker_top = parseInt(document.getElementById("ui-datepicker-div").style.getPropertyValue("top"), 10); + + if (datepicker_top > 370 && !is_null) { + document.getElementById("ui-datepicker-div").style.marginTop = "30px"; + } + if (is_null){ $(g.cEdit).find('.edit_area').hide(); } From 7ceeeb1fbe2eacb6a036598a1fd0ba803ae759ee Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 5 Mar 2015 15:16:17 -0500 Subject: [PATCH 2/2] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index da314611b6..569ed38416 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug #4746 Right-aligned columns have left-aligned header - bug #4779 PMA_Util::parseEnumSetValues fails on enums with UTF-8 values - bug Undefined index savedsearcheswork +- bug #4788 Inline edit of DATE fields with NULL, NULL checkbox is under datepicker 4.3.11.1 (2015-03-04) - bug [security] Risk of BREACH attack, see PMASA-2015-1