Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-03 11:55:52 +01:00
Code Issues Packages Projects Releases Activity

Optimize datetime field

Browse Source
This commit is contained in:
Matias Griese
2019-08-26 15:09:04 +03:00
parent 5dad360946
commit 4af1da9d95
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
classes/plugin/Admin.php
View File

@@ -1318,22 +1318,21 @@ class Admin
]; ];
if (!isset($guess[$date])) { if (!isset($guess[$date])) {
$guess[$date] = 'd-m-Y H:i';
foreach ($date_formats as $date_format) { foreach ($date_formats as $date_format) {
foreach ($time_formats as $time_format) { foreach ($time_formats as $time_format) {
if ($this->validateDate($date, "$date_format $time_format")) { $full_format = "{$date_format} {$time_format}";
$guess[$date] = "$date_format $time_format"; if ($this->validateDate($date, $full_format)) {
$guess[$date] = $full_format;
break 2; break 2;
} }
if ($this->validateDate($date, "$time_format $date_format")) { $full_format = "{$time_format} {$date_format}";
$guess[$date] = "$time_format $date_format"; if ($this->validateDate($date, $full_format)) {
$guess[$date] = $full_format;
break 2; break 2;
} }
} }
} }
if (!isset($guess[$date])) {
$guess[$date] = 'd-m-Y H:i';
}
} }
return $guess[$date]; return $guess[$date];

2
themes/grav/templates/forms/fields/datetime/datetime.html.twig
View File

@@ -2,7 +2,7 @@
{% set value = (value is null ? field.default : value) %} {% set value = (value is null ? field.default : value) %}
{% set default_php_dateformat = admin.guessDateFormat(value) %} {% set default_php_dateformat = admin.guessDateFormat(value) %}
{% set php_dateformat = field.format ?: admin.page.dateformat ?: config.system.pages.dateformat.default ?: default_php_dateformat %} {% set php_dateformat = field.format ?: (form ? form.object.dateformat : admin.page.dateformat) ?: config.system.pages.dateformat.default ?: default_php_dateformat %}
{% set js_dateformat = admin.dateformatToMomentJS(php_dateformat) %} {% set js_dateformat = admin.dateformatToMomentJS(php_dateformat) %}
{% set value = (value is null ? value : value|date(php_dateformat)) %} {% set value = (value is null ? value : value|date(php_dateformat)) %}