From 051d26327f33ca6edc9459e7e3daf9a09bc9a373 Mon Sep 17 00:00:00 2001 From: andrewshuba Date: Thu, 12 Sep 2019 14:29:33 +0300 Subject: [PATCH 1/4] - fix member directory timepicker --- assets/js/um-members.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/assets/js/um-members.js b/assets/js/um-members.js index 8bd436aa..071cc81a 100644 --- a/assets/js/um-members.js +++ b/assets/js/um-members.js @@ -932,12 +932,14 @@ jQuery(document).ready( function() { var min = elem.data('min'); var max = elem.data('max'); + var picker_min = min.split(':'); + var picker_max = max.split(':'); var $input = elem.pickatime({ format: elem.data('format'), interval: parseInt( elem.data('intervals') ), - min: elem.data('min'), - max: elem.data('max'), + min: [picker_min[0],picker_min[1]], + max: [picker_max[0],picker_max[1]], formatSubmit: 'HH:i', hiddenName: true, onOpen: function() { elem.blur(); }, From 8f34066004c1e3c6523377d7495a4e9edf5d5f8f Mon Sep 17 00:00:00 2001 From: andrewshuba Date: Thu, 12 Sep 2019 15:45:07 +0300 Subject: [PATCH 2/4] - fix time in user card if empty --- includes/core/um-filters-fields.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/includes/core/um-filters-fields.php b/includes/core/um-filters-fields.php index 623dea0c..64ef2749 100644 --- a/includes/core/um-filters-fields.php +++ b/includes/core/um-filters-fields.php @@ -187,10 +187,12 @@ add_filter( 'um_profile_field_filter_hook__textarea', 'um_profile_field_filter_h * @return mixed|string */ function um_profile_field_filter_hook__time( $value, $data ) { - $value = UM()->datetime()->format( $value, $data['format'] ); + if( $value ) { + $value = UM()->datetime()->format( $value, $data['format'] ); - $value = str_replace('am', 'a.m.', $value ); - $value = str_replace('pm', 'p.m.', $value ); + $value = str_replace( 'am', 'a.m.', $value ); + $value = str_replace( 'pm', 'p.m.', $value ); + } return $value; } add_filter( 'um_profile_field_filter_hook__time', 'um_profile_field_filter_hook__time', 99, 2 ); From a0fe0df547256e0cdee7e02b36d00c7ba7de9a2d Mon Sep 17 00:00:00 2001 From: andrewshuba Date: Fri, 13 Sep 2019 11:14:19 +0300 Subject: [PATCH 3/4] - remove empty element in timepicker_filters_range --- includes/core/class-member-directory.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/includes/core/class-member-directory.php b/includes/core/class-member-directory.php index 2fbe38d9..4aaba36f 100644 --- a/includes/core/class-member-directory.php +++ b/includes/core/class-member-directory.php @@ -739,6 +739,8 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) { WHERE meta_key = %s ORDER BY meta_value DESC", $filter ) ); + $meta = array_filter($meta); + if ( empty( $meta ) || count( $meta ) === 1 ) { $range = false; } elseif ( ! empty( $meta ) ) { From 949ad4c8753340f39d69fc41213b83c544ab28c4 Mon Sep 17 00:00:00 2001 From: andrewshuba Date: Fri, 13 Sep 2019 14:18:22 +0300 Subject: [PATCH 4/4] - if empty value for all filter fields --- includes/core/um-filters-fields.php | 33 ++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/includes/core/um-filters-fields.php b/includes/core/um-filters-fields.php index 64ef2749..274ea830 100644 --- a/includes/core/um-filters-fields.php +++ b/includes/core/um-filters-fields.php @@ -96,6 +96,9 @@ add_filter( 'um_profile_field_filter_hook__vimeo_video', 'um_profile_field_filte * @return string */ function um_profile_field_filter_hook__googlemap( $value, $data ) { + if ( ! $value ) { + return ''; + } $value = '
'; @@ -114,6 +117,9 @@ add_filter( 'um_profile_field_filter_hook__googlemap', 'um_profile_field_filter_ */ function um_profile_field_filter_hook__user_registered( $value, $data ) { + if ( ! $value ) { + return ''; + } $value = strtotime($value); $value = sprintf(__('Joined %s','ultimate-member'), date_i18n('F d, Y', $value) ); return $value; @@ -130,6 +136,9 @@ add_filter( 'um_profile_field_filter_hook__user_registered', 'um_profile_field_f * @return string */ function um_profile_field_filter_hook__last_login( $value, $data ) { + if ( ! $value ) { + return ''; + } //$value = sprintf( __('Last login: %s','ultimate-member'), um_user_last_login( um_user('ID') ) ); $value = um_user_last_login( um_user( 'ID' ) ); return $value; @@ -147,6 +156,9 @@ add_filter( 'um_profile_field_filter_hook___um_last_login', 'um_profile_field_fi * @return mixed|string|void */ function um_profile_field_filter_hook__textarea( $value, $data ) { + if ( ! $value ) { + return ''; + } if ( isset( $data['html'] ) && $data['html'] == 1 ) { return $value; } @@ -187,12 +199,14 @@ add_filter( 'um_profile_field_filter_hook__textarea', 'um_profile_field_filter_h * @return mixed|string */ function um_profile_field_filter_hook__time( $value, $data ) { - if( $value ) { - $value = UM()->datetime()->format( $value, $data['format'] ); - - $value = str_replace( 'am', 'a.m.', $value ); - $value = str_replace( 'pm', 'p.m.', $value ); + if ( ! $value ) { + return ''; } + $value = UM()->datetime()->format( $value, $data['format'] ); + + $value = str_replace( 'am', 'a.m.', $value ); + $value = str_replace( 'pm', 'p.m.', $value ); + return $value; } add_filter( 'um_profile_field_filter_hook__time', 'um_profile_field_filter_hook__time', 99, 2 ); @@ -207,6 +221,9 @@ add_filter( 'um_profile_field_filter_hook__time', 'um_profile_field_filter_hook_ * @return string */ function um_profile_field_filter_hook__date( $value, $data ) { + if ( ! $value ) { + return ''; + } if ( isset( $data['pretty_format'] ) && $data['pretty_format'] == 1 ) { $value = UM()->datetime()->get_age( $value ); } else { @@ -226,6 +243,9 @@ add_filter( 'um_profile_field_filter_hook__date', 'um_profile_field_filter_hook_ * @return string */ function um_profile_field_filter_hook__file( $value, $data ) { + if ( ! $value ) { + return ''; + } $file_type = wp_check_filetype( $value ); $uri = UM()->files()->get_download_link( UM()->fields()->set_id, $data['metakey'], um_user( 'ID' ) ); @@ -273,6 +293,9 @@ add_filter( 'um_profile_field_filter_hook__file', 'um_profile_field_filter_hook_ * @return string */ function um_profile_field_filter_hook__image( $value, $data ) { + if ( ! $value ) { + return ''; + } $uri = UM()->files()->get_download_link( UM()->fields()->set_id, $data['metakey'], um_user( 'ID' ) ); $title = ( isset( $data['title'] ) ) ? $data['title'] : __( 'Untitled photo', 'ultimate-member' );