Merge pull request #374 from ivanteoh/github-main

Show the date and time edit fields when the date time format contains %I or %y.
plomino · Jul 29, 2013 · d9b8a74 · d9b8a74
2 parents f894839 + bc294e2
commit d9b8a74
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Products/CMFPlomino/skins/cmfplomino_templates/DATETIMEFieldEdit.pt b/Products/CMFPlomino/skins/cmfplomino_templates/DATETIMEFieldEdit.pt
@@ -3,8 +3,8 @@
                        defaultformat python:db.getDateTimeFormat();
                        fieldformat python:options['field'].getSettings('format');
                        format python:test(not(fieldformat),defaultformat,fieldformat);
-                       hm python:('%H' in format);
-                       ymd python:('%Y' in format)">
+                       hm python:('%H' in format or '%I' in format);
+                       ymd python:('%Y' in format or '%y' in format)">
 
 	<tal:block tal:condition="python:test(v)">
 		<span>