diff --git a/assets/js/um-members.js b/assets/js/um-members.js index 19b94f03..8eb08847 100644 --- a/assets/js/um-members.js +++ b/assets/js/um-members.js @@ -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(); - } + } diff --git a/includes/admin/templates/directory/general.php b/includes/admin/templates/directory/general.php index b516cb8d..23a80a2a 100644 --- a/includes/admin/templates/directory/general.php +++ b/includes/admin/templates/directory/general.php @@ -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( diff --git a/includes/class-config.php b/includes/class-config.php index 5059c977..09ef157e 100644 --- a/includes/class-config.php +++ b/includes/class-config.php @@ -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', diff --git a/includes/core/class-member-directory.php b/includes/core/class-member-directory.php index 913a030e..4fc11784 100644 --- a/includes/core/class-member-directory.php +++ b/includes/core/class-member-directory.php @@ -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']; } } diff --git a/templates/members.php b/templates/members.php index 4d7aa79b..8827f4d0 100644 --- a/templates/members.php +++ b/templates/members.php @@ -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 ); ?> 1 ) { ?> + if ( isset( $args['enable_sorting'] ) && ! empty( $sorting_options ) && count( $sorting_options ) > 1 ) { ?>