10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-19 14:43:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/map_layout' into development/metatable

Browse Source 
# Conflicts:
#	assets/js/um-members.min.js
This commit is contained in:
nikitasinelnikov
2020-01-03 12:52:57 +02:00
parent 26065a1aa3 38bde3fe2d
commit 3301d05f9f
7 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/core/class-admin-metabox.php
+15 -1
View File
@@ -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
+23 -7
View File
@@ -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 );
}