Merge #15632 and #15631 - UI fixes for datetime picker and modal

Fixes: #15623
Pull-request: #15631
Pull-request: #15632
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2019-12-16 22:03:47 +01:00
commit ac9118d044
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
2 changed files with 5 additions and 1 deletions

View File

@ -112,6 +112,10 @@ $.ajaxPrefilter(function (options, originalOptions) {
* @param {object} $thisElement a jQuery object pointing to the element
*/
Functions.addDatepicker = function ($thisElement, type, options) {
if (type !== 'date' && type !== 'time' && type !== 'datetime' && type !== 'timestamp') {
return;
}
var showTimepicker = true;
if (type === 'date') {
showTimepicker = false;

View File

@ -380,7 +380,7 @@ AJAX.registerOnload('table/select.js', function () {
'<span class="small_font">' + max + '</span>' +
'</fieldset>'
).dialog({
minWidth: 500,
width: 'auto',
maxHeight: 400,
modal: true,
buttons: buttonOptions,