From 4348fe071d176a1b39ef853f618877bf4c3c1aa1 Mon Sep 17 00:00:00 2001 From: Yash Bothra Date: Thu, 26 Dec 2019 19:06:25 +0530 Subject: [PATCH 1/3] #15695 added timeInput datepicker option Signed-off-by: Yash Bothra --- js/functions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/functions.js b/js/functions.js index de2cd8fe61..8ae751eac9 100644 --- a/js/functions.js +++ b/js/functions.js @@ -102,6 +102,7 @@ function PMA_addDatepicker ($this_element, type, options) { var currentDateTime = new Date(); var defaultOptions = { + timeInput : true, hour: currentDateTime.getHours(), minute: currentDateTime.getMinutes(), second: currentDateTime.getSeconds(), From 99f2c9e4aaddbe9f49fa81d7b03a1d22f2a79e85 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 26 Dec 2019 12:20:21 +0100 Subject: [PATCH 2/3] Fix import status URLs Signed-off-by: William Desportes --- templates/display/import/javascript.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/display/import/javascript.twig b/templates/display/import/javascript.twig index 5f3e46c526..84af1b3e95 100644 --- a/templates/display/import/javascript.twig +++ b/templates/display/import/javascript.twig @@ -6,9 +6,9 @@ $( function() { {% if handler != 'PhpMyAdmin\\Plugins\\Import\\Upload\\UploadNoplugin' %} {# Some variable for javascript #} - {% set ajax_url = 'import_status.php?id=' ~ upload_id ~ '&' ~ Url_getCommonRaw({ + {% set ajax_url = 'import_status.php?id=' ~ upload_id ~ Url_getCommonRaw({ 'import_status': 1 - }) %} + }, '&') %} {% set promot_str = Sanitize_jsFormat( 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'|trans, false @@ -21,7 +21,7 @@ $( function() { 'The file is being processed, please be patient.'|trans, false ) %} - {% set import_url = Url_getCommonRaw({'import_status': 1}) %} + {% set import_url = Url_getCommonRaw({'import_status': 1}, '&') %} {% set upload_html %} {% apply spaceless %} From ed932e87d6e06c35c8c3075f1fa313ec1d7fcfce Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 26 Dec 2019 15:00:07 +0100 Subject: [PATCH 3/3] Add ChangeLog entry for #15695 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 599d5e8ce4..2f304b8790 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ phpMyAdmin - ChangeLog - issue Fix Uncaught php TypeError on php 8.0 when adding a column to table create form - issue #15682 Fix calendar not taking current time as default value - issue #15636 Fix php error trying to access array offset on value o type null on replication GUI +- issue #15695 Fix input field for the time in datetime picker is disabled 4.9.2 (2019-11-21) - issue #14184 Change the cookie name from phpMyAdmin to phpMyAdmin_https for HTTPS, fixes many "Failed to set session cookie" errors