10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta/2.1.0' of https://github.com/ultimatemember/ultimatemember into beta/2.1.0

Browse Source
This commit is contained in:
nikitasinelnikov
2019-09-05 12:51:13 +03:00
parent 616e5301fb e72cd11810
commit e12d6319d8
5 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/js/um-members.js
+18 -13
View File
@@ -442,22 +442,27 @@ function um_change_tag( directory ) {
directory.find('.um-members-filter-tag').remove();
var filters_template = wp.template( 'um-members-filtered-line' );
directory.find('.um-filtered-line').prepend( filters_template( {'filters': filters_data} ) );
var filtered_line = directory.find('.um-filtered-line');
if( filtered_line.length ){
var filters_template = wp.template( 'um-members-filtered-line' );
filtered_line.prepend( filters_template( {'filters': filters_data} ) );
if ( filters_data.length > 0 ) {
directory.find('.um-filtered-line').show();
show_after_search = false;
} else {
directory.find('.um-filtered-line').hide();
show_after_search = true;
if ( filters_data.length > 0 ) {
filtered_line.show();
show_after_search = false;
} else {
filtered_line.hide();
show_after_search = true;
}
if ( directory.find( '.um-members-filter-remove' ).length === 0 ) {
directory.find('.um-clear-filters-a').hide();
} else {
directory.find('.um-clear-filters-a').show();
}
}
if ( directory.find( '.um-members-filter-remove' ).length === 0 ) {
directory.find('.um-clear-filters-a').hide();
} else {
directory.find('.um-clear-filters-a').show();
}
}
includes/admin/templates/directory/general.php
+2 -2
View File
@@ -19,7 +19,7 @@ if ( $show_these_users ) {
}
$_um_view_types_value = get_post_meta( $post_id, '_um_view_types', true );
$_um_view_types_value = empty( $_um_view_types_value ) ? array( 'grid' ) : $_um_view_types_value;
$_um_view_types_value = empty( $_um_view_types_value ) ? array( 'grid', 'list' ) : $_um_view_types_value;
$view_types_options = array_map( function( $item ) {
return $item['title'];
@@ -55,7 +55,7 @@ foreach ( $view_types_options as $key => $value ) {
'label' => __( 'Default view type', 'ultimate-member' ),
'tooltip' => __( 'Default directory view type', 'ultimate-member' ),
'options' => $view_types_options,
'value' => UM()->query()->get_meta_value( '_um_default_view', null, '' ),
'value' => UM()->query()->get_meta_value( '_um_default_view', null, 'grid' ),
'conditional' => array( implode( '|', $conditional ), '~', 1 )
),
array(
includes/class-config.php
+1 -1
View File
@@ -145,7 +145,7 @@ if ( ! class_exists( 'um\Config' ) ) {
'_um_show_social' => 0,
'_um_show_userinfo' => 0,
'_um_show_tagline' => 0,
'_um_search' => 0,
'_um_search' => 1,
'_um_userinfo_animate' => '1',
'_um_sortby' => 'user_registered_desc',
'_um_profile_photo' => '1',
includes/core/class-member-directory.php
+7 -5
View File
@@ -275,12 +275,14 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
$this->filter_supported_fields = apply_filters( 'um_members_directory_custom_field_types_supported_filter', array( 'date', 'time', 'select', 'multiselect', 'radio', 'checkbox', 'rating' ) );
foreach ( UM()->builtin()->saved_fields as $key => $data ) {
if ( isset( $data['type'] ) && in_array( $data['type'], $this->filter_supported_fields ) ) {
if ( isset( $data['title'] ) && array_search( $data['title'], $this->filter_fields ) !== false ) {
$data['title'] = $data['title'] . ' (' . $key . ')';
if ( UM()->builtin()->saved_fields ) {
foreach ( UM()->builtin()->saved_fields as $key => $data ) {
if ( isset( $data['type'] ) && in_array( $data['type'], $this->filter_supported_fields ) ) {
if ( isset( $data['title'] ) && array_search( $data['title'], $this->filter_fields ) !== false ) {
$data['title'] = $data['title'] . ' (' . $key . ')';
}
$this->filter_fields[ $key ] = isset( $data['title'] ) ? $data['title'] : $data['label'];
}
$this->filter_fields[ $key ] = isset( $data['title'] ) ? $data['title'] : $data['label'];
}
}
templates/members.php
+3 -3
View File
@@ -50,7 +50,7 @@ if ( count( $args['view_types'] ) == 1 ) {
$default_sorting = ! empty( $args['sortby'] ) ? $args['sortby'] : 'user_registered_desc';
$sort_from_url = '';
if ( $args['enable_sorting'] ) {
if ( isset( $args['enable_sorting'] ) ) {
$sorting_options = empty( $args['sorting_fields'] ) ? array() : $args['sorting_fields'];
if ( ! in_array( $default_sorting, $sorting_options ) ) {
$sorting_options[] = $default_sorting;
@@ -107,7 +107,7 @@ if ( ! $single_view ) {
$classes .= ' um-member-with-view';
}
if ( $args['enable_sorting'] && ! empty( $sorting_options ) && count( $sorting_options ) > 1 ) {
if ( isset( $args['enable_sorting'] ) && ! empty( $sorting_options ) && count( $sorting_options ) > 1 ) {
$classes .= ' um-member-with-sorting';
}
@@ -141,7 +141,7 @@ UM()->get_template( 'members-pagination.php', '', $args, true ); ?>
</div>
<?php }
if ( $args['enable_sorting'] && ! empty( $sorting_options ) && count( $sorting_options ) > 1 ) { ?>
if ( isset( $args['enable_sorting'] ) && ! empty( $sorting_options ) && count( $sorting_options ) > 1 ) { ?>
<div class="um-member-directory-sorting">
<select class="um-s3 um-member-directory-sorting-options" id="um-member-directory-sorting-select-<?php echo esc_attr( $form_id ) ?>" data-placeholder="<?php esc_attr_e( 'Sort By', 'ultimate-member' ); ?>">
<?php foreach ( $sorting_options as $value => $title ) { ?>