It is now possible to manually specify a format for the datetime fi…

…eld (fixes getgrav/grav#1261)
getgrav · Jan 20, 2017 · d6afa39 · d6afa39
1 parent 81b7dd1
commit d6afa39
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # v1.2.10
 ## XX/XX/2017
 
+1. [](#improved)
+    * It is now possible to manually specify a format for the `datetime` field [#1261](https://github.com/getgrav/grav/issues/1261)
 1. [](#bugfix)
     * Fixed issue with downloaded package when installing a testing release
 

diff --git a/themes/grav/templates/forms/fields/datetime/datetime.html.twig b/themes/grav/templates/forms/fields/datetime/datetime.html.twig
@@ -2,7 +2,7 @@
 
 {% set value = (value is null ? field.default : value) %}
 {% set default_php_dateformat = admin.guessDateFormat(value) %}
-{% set php_dateformat = admin.page.dateformat ?: config.system.pages.dateformat.default ?: default_php_dateformat %}
+{% set php_dateformat = field.format ?: admin.page.dateformat ?: config.system.pages.dateformat.default ?: default_php_dateformat %}
 {% set js_dateformat = admin.dateformatToMomentJS(php_dateformat) %}
 {% set value = (value is null ? value : value|date(php_dateformat)) %}