Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Date format mapper - redo #7041

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open

Date format mapper - redo #7041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1acc811
Date field mapper
JoryHogeveen Mar 27, 2023
7bc694d
Include modified fields
JoryHogeveen Mar 27, 2023
5aea65a
Wordpress default formats
JoryHogeveen Mar 27, 2023
694ca34
Improve default support
JoryHogeveen Mar 27, 2023
3b96da7
Remove redundant code
JoryHogeveen Mar 27, 2023
aee04c0
Add test for date field mapper
JoryHogeveen Mar 29, 2023
9433688
Apply suggestions from code review
JoryHogeveen Mar 29, 2023
cb952e9
Reference to PodsForm::date_field_types
JoryHogeveen Mar 29, 2023
7ec5480
Do not return a default value
JoryHogeveen Mar 29, 2023
2d7e82b
Simply require field data
JoryHogeveen Mar 29, 2023
ee2e9ea
Default formatting based on field type
JoryHogeveen Mar 29, 2023
eca2f3c
Add tests for predefined formats
JoryHogeveen Mar 29, 2023
87365f0
Tests for all date/time field types
JoryHogeveen Mar 29, 2023
17db26e
Fix var names
JoryHogeveen Mar 29, 2023
3d19a60
Do not parse through field methods if the value is already mapped
JoryHogeveen Mar 29, 2023
8917aac
Refactor test method
JoryHogeveen Mar 29, 2023
8dd5cf9
Add object field tests
JoryHogeveen Apr 3, 2023
fe1a4b3
Adjust test
sc0ttkclark Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions classes/Pods.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,7 @@ public function field( $name, $single = null, $raw = false ) {
$is_tableless_field = in_array( $field_type, $tableless_field_types, true );
$is_repeatable_field = $field_data instanceof Field && $field_data->is_repeatable();
$is_pick_field = 'pick' === $field_type;
$is_mapped = false;

// Handle output specific handling.
if ( $is_pick_field ) {
Expand Down Expand Up @@ -925,11 +926,11 @@ public function field( $name, $single = null, $raw = false ) {

$value = $map_field_values->map_value( $first_field, $traverse_fields, $is_field_set ? $field_data : null, $this, $params );

$object_field_found = null !== $value;
$is_mapped = null !== $value;
}

// Continue regular field parsing.
if ( false === $object_field_found ) {
if ( false === $object_field_found && false === $is_mapped ) {
$params->traverse = array( $params->name );

if ( false !== strpos( $params->name, '.' ) ) {
Expand Down Expand Up @@ -1696,7 +1697,7 @@ public function field( $name, $single = null, $raw = false ) {
$value = array_merge( ...$value );
}

if ( ! empty( $field_data ) && ( $params->display || ! $params->raw ) && ! $params->in_form && ! $params->raw_display ) {
if ( ! $is_mapped && ! empty( $field_data ) && ( $params->display || ! $params->raw ) && ! $params->in_form && ! $params->raw_display ) {
sc0ttkclark marked this conversation as resolved.
Show resolved Hide resolved
if ( $params->display || ( ( $params->get_meta || $params->deprecated ) && ! in_array( $field_data['type'], $tableless_field_types, true ) ) ) {
$post_temp = false;
$old_post = null;
Expand Down
86 changes: 86 additions & 0 deletions src/Pods/Data/Map_Field_Values.php
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

156 changes: 156 additions & 0 deletions tests/codeception/wpunit/Pods/MappingTest.php
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.