fix so datetime combo field respects date-format and time format a set up by the user #446
Conversation
…d of just trying strtotime directly
…tialized with its own date-format The js initializer reads data-datepicker to set each datepicker properly
…at options for the datepickers
…e characters into your date-format string
…ttribute as in date-picker)
Conflicts: includes/CMB2_Sanitize.php includes/CMB2_Types.php js/cmb2.min.js languages/cmb2-es_ES.mo languages/cmb2-es_ES.po
Conflicts: js/cmb2.min.js languages/cmb2-es_ES.mo languages/cmb2-es_ES.po
…ime-picker-fixes
…et up by the user
|
Timezone combo done as well. Regards, hope this helps. |
Conflicts: includes/CMB2_Types.php includes/CMB2_Utils.php js/cmb2.min.js
Conflicts: js/cmb2.min.js
|
@jtsternberg, this PR has current trunk merged in, and I have tested it and have it working for all date/time types I'm aware of. |
| @@ -212,10 +225,12 @@ public function text_datetime_timestamp( $repeat = false ) { | |||
| return $repeat_value; | |||
| } | |||
|
|
|||
| $this->value = strtotime( $this->value['date'] . ' ' . $this->value['time'] ); | |||
| if ( is_array( $this->value ) && isset( $this->value['date'] ) ) { | |||
There was a problem hiding this comment.
Does this account for repeating datetime fields?
I'm seeing this issue mentioned in #330 as well. I was looking through the code and believe I have narrowed it down to the deleted line 215 failing to account for repeatable fields. However I havnt had the time to try to fix it.
There was a problem hiding this comment.
I'll look into the repeatable field issues (hopefully tomorrow).
|
Thanks for all your hard work here. I've merged it in and have made some changes to reign the scope in a bit. It seems to work well in my testing, but please test on your end to verify.
What is the use-case where that is necessary?
Good idea, I updated the trunk branch of the wiki and will merge it to master when the next version of CMB2 is released with this update/change.
I saw that in your branch, but that is not part of how CMB2 currently works. I've removed it and it's using the timestamp as it should. |
I still have to review the datetime-timezone field.
A couple things:
Since in CMB_Field.php:630 you have
return date( stripslashes( $this->args( $format ) ), $meta_value );users wont be able to use escape characters in their format strings. (E.g.: 'd \d\e m \d\e Y', or any other combinations).
Either that should be reflected in the docs, or that particular stripslashes should go... :P
I edited the wiki to reflect that there are no longer separate "text_date" and "text_date_timestamp". But I guess we should also put there the acceptable characters for the format string (d, j, z, m, n, y, and Y, instead of the whole date() range).
I'll try to finish up the timezone combo later today.
Regards!