Merge branch 'feature/map_layout' into development/metatable

# Conflicts:
#	assets/js/um-members.min.js

assets/js/um-members.js

@@ -334,7 +334,7 @@ function um_ajax_get_members( directory, args ) {
 			}
 
 			//args.directory = directory;
-			jQuery( document ).trigger('um_members_rendered', args );
+			jQuery( document ).trigger('um_members_rendered', [ directory, answer ] );
 
 			um_init_new_dropdown();
 

includes/admin/core/class-admin-metabox.php

@@ -672,7 +672,21 @@ if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
 		 */
 		function load_metabox_directory( $object, $box ) {
 			$box['id'] = str_replace( 'um-admin-form-', '', $box['id'] );
-			include_once UM()->admin()->templates_path . 'directory/'. $box['id'] . '.php';
+
+			preg_match('#\{.*?\}#s', $box['id'], $matches );
+
+			if ( isset( $matches[0] ) ) {
+				$path = $matches[0];
+				$box['id'] = preg_replace('~(\\{[^}]+\\})~','', $box['id'] );
+			} else {
+				$path = um_path;
+			}
+
+			$path = str_replace('{','', $path );
+			$path = str_replace('}','', $path );
+
+
+			include_once $path . 'includes/admin/templates/directory/'. $box['id'] . '.php';
 			wp_nonce_field( basename( __FILE__ ), 'um_admin_save_metabox_directory_nonce' );
 		}
 

includes/core/class-member-directory.php

@@ -988,14 +988,23 @@ PRIMARY KEY  (id)
 			}
 
 			$meta_query = array(
-				"relation"  => "OR",
+				'relation'  => 'OR',
 				array(
 					'key'       => 'hide_in_members',
-					'value'     => '',
 					'compare'   => 'NOT EXISTS'
 				),
-				array(
-					"relation"  => "AND",
+			);
+
+
+			if ( __( 'Yes', 'ultimate-member' ) == 'Yes' ) {
+				$meta_query[] = array(
+					'key'       => 'hide_in_members',
+					'value'     => 'Yes',
+					'compare'   => 'NOT LIKE',
+				);
+			} else {
+				$meta_query[] = array(
+					'relation'  => 'AND',
 					array(
 						'key'       => 'hide_in_members',
 						'value'     => __( 'Yes', 'ultimate-member' ),
@@ -1006,8 +1015,8 @@ PRIMARY KEY  (id)
 						'value'     => 'Yes',
 						'compare'   => 'NOT LIKE'
 					),
-				),
-			);
+				);
+			}
 
 			$this->query_args['meta_query'] = array_merge( $this->query_args['meta_query'], array( $meta_query ) );
 		}
@@ -2101,6 +2110,7 @@ PRIMARY KEY  (id)
 			$hook_after_user_name = ob_get_clean();
 
 			$data_array = array(
+				'card_anchor'           => substr( md5( $user_id ), 10, 5 ),
 				'id'                    => $user_id,
 				'role'                  => um_user( 'role' ),
 				'account_status'        => um_user( 'account_status' ),
@@ -2401,7 +2411,13 @@ PRIMARY KEY  (id)
 			um_reset_user();
 			// end of user card
 
-			wp_send_json_success( array( 'pagination' => $pagination_data, 'users' => $users, 'is_search' => $this->is_search ) );
+			$member_directory_response = apply_filters( 'um_ajax_get_members_response', array(
+				'pagination'    => $pagination_data,
+				'users'         => $users,
+				'is_search'     => $this->is_search,
+			), $directory_data );
+
+			wp_send_json_success( $member_directory_response );
 		}
 
 

templates/members-grid.php

@@ -9,7 +9,7 @@ $unique_hash = substr( md5( $args['form_id'] ), 10, 5 ); ?>
 		<# if ( data.length > 0 ) { #>
 			<# _.each( data, function( user, key, list ) { #>
 
-				<div class="um-member um-role-{{{user.role}}} {{{user.account_status}}} <?php if ( $cover_photos ) { echo 'with-cover'; } ?>">
+				<div id="um-member-{{{user.card_anchor}}}-<?php echo esc_attr( $unique_hash ) ?>" class="um-member um-role-{{{user.role}}} {{{user.account_status}}} <?php if ( $cover_photos ) { echo 'with-cover'; } ?>">
 
 					<span class="um-member-status {{{user.account_status}}}">
 						{{{user.account_status_name}}}

templates/members-list.php

@@ -8,7 +8,7 @@ $unique_hash = substr( md5( $args['form_id'] ), 10, 5 ); ?>
 		<# if ( data.length > 0 ) { #>
 			<# _.each( data, function( user, key, list ) { #>
 
-				<div class="um-member um-role-{{{user.role}}} {{{user.account_status}}} <?php if ( $cover_photos ) { echo 'with-cover'; } ?>">
+				<div id="um-member-{{{user.card_anchor}}}-<?php echo esc_attr( $unique_hash ) ?>" class="um-member um-role-{{{user.role}}} {{{user.account_status}}} <?php if ( $cover_photos ) { echo 'with-cover'; } ?>">
 					<span class="um-member-status {{{user.account_status}}}">
 						{{{user.account_status_name}}}
 					</span>

templates/members.php

@@ -188,6 +188,9 @@ if ( ( ( $search && $show_search ) || ( $filters && $show_filters && count( $sea
 	<div class="um-members-overlay"><div class="um-ajax-loading"></div></div>
 
 	<div class="um-member-directory-header um-form">
+
+		<?php do_action( 'um_members_directory_before_head', $args, $form_id ); ?>
+
 		<?php if ( $search && $show_search ) { ?>
 			<div class="um-member-directory-header-row um-member-directory-search-row">
 				<div class="um-member-directory-search-line">