- fixed callback function for select-type filter - return only existed values;

- fixed conflict with php_data variable in admin JS;
This commit is contained in:
nikitasinelnikov
2019-11-22 11:55:21 +02:00
parent c8674d3209
commit 5c807204c3
10 changed files with 97 additions and 101 deletions
+1 -2
View File
@@ -1233,8 +1233,6 @@ jQuery(document.body).ready( function() {
var hash = um_members_get_hash( directory );
um_member_directories.push( hash );
// slideup/slidedown animation fix for grid filters bar
if ( directory.find('.um-search').length ) {
if ( ! directory.find('.um-search').is(':visible') ) {
@@ -1478,6 +1476,7 @@ jQuery(document.body).ready( function() {
}
});
var show_after_search = directory.data('must-search');
if ( show_after_search === 1 ) {
var search = um_get_search( directory );
+1 -1
View File
File diff suppressed because one or more lines are too long
+4 -4
View File
@@ -27,7 +27,7 @@ jQuery(document).ready( function() {
list.append(
'<li class="um-multi-selects-option-line"><span class="um-field-wrapper">' + selector_html +
'</span><span class="um-field-control"><a href="javascript:void(0);" class="um-select-delete">' + php_data.texts.remove + '</a></span></li>'
'</span><span class="um-field-control"><a href="javascript:void(0);" class="um-select-delete">' + wp.i18n.__( 'Remove', 'ultimate-member' ) + '</a></span></li>'
);
list.find('li:last .um-hidden-multi-selects').attr('name', jQuery(this).data('name') ).
@@ -284,7 +284,7 @@ jQuery(document).ready( function() {
list.append(
'<li class="um-md-default-filters-option-line"><span class="um-field-wrapper">' + selector_html +
'</span></span><span class="um-field-control"><a href="javascript:void(0);" class="um-select-delete">' + php_data.texts.remove + '</a></span><span class="um-field-wrapper2 um"></li>'
'</span></span><span class="um-field-control"><a href="javascript:void(0);" class="um-select-delete">' + wp.i18n.__( 'Remove', 'ultimate-member' ) + '</a></span><span class="um-field-wrapper2 um"></li>'
);
list.find('li:last .um-hidden-md-default-filters').attr('name', jQuery(this).data('name') ).
@@ -318,7 +318,7 @@ jQuery(document).ready( function() {
list.append(
'<li class="' + classes + '"><span class="um-field-wrapper">' + text_html +
'</span><span class="um-field-control"><a href="javascript:void(0);" class="um-text-delete">' + php_data.texts.remove + '</a></span></li>'
'</span><span class="um-field-control"><a href="javascript:void(0);" class="um-text-delete">' + wp.i18n.__( 'Remove', 'ultimate-member' ) + '</a></span></li>'
);
list.find('li:last .um-hidden-multi-text').attr('name', jQuery(this).data('name') ).
@@ -366,7 +366,7 @@ jQuery(document).ready( function() {
frame = wp.media({
title: button.data('upload_frame'),
button: {
text: php_data.texts.select
text: wp.i18n.__( 'Select', 'ultimate-member' )
},
multiple: false // Set to true to allow multiple files to be selected
});
@@ -21,7 +21,7 @@ jQuery( document ).ready( function() {
jQuery( '#um-settings-wrap .um-nav-tab-wrapper a, #um-settings-wrap .subsubsub a' ).click( function() {
if ( changed ) {
window.onbeforeunload = function() {
return php_data.onbeforeunload_text;
return wp.i18n.__( 'Are sure, maybe some settings not saved', 'ultimate-member' );
};
} else {
window.onbeforeunload = '';
+2 -21
View File
@@ -227,17 +227,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
wp_register_style( 'um_admin_forms', $this->css_url . 'um-admin-forms.css', array( 'wp-color-picker', 'um_ui' ), ultimatemember_version );
wp_enqueue_style( 'um_admin_forms' );
wp_register_script( 'um_admin_forms', $this->js_url . 'um-admin-forms.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script( 'um_admin_forms', $this->js_url . 'um-admin-forms.js', array( 'jquery', 'wp-i18n' ), ultimatemember_version, true );
wp_enqueue_script( 'um_admin_forms' );
$localize_data = array(
'texts' => array(
'remove' => __( 'Remove', 'ultimate-member' ),
'select' => __( 'Select', 'ultimate-member' )
)
);
wp_localize_script( 'um_admin_forms', 'php_data', $localize_data );
}
@@ -257,18 +248,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
wp_register_style( 'um_admin_settings', $this->css_url . 'um-admin-settings.css', array(), ultimatemember_version );
wp_enqueue_style( 'um_admin_settings' );
wp_register_script( 'um_admin_settings', $this->js_url . 'um-admin-settings.js', array( 'jquery' ), ultimatemember_version, true );
wp_register_script( 'um_admin_settings', $this->js_url . 'um-admin-settings.js', array( 'jquery', 'wp-i18n' ), ultimatemember_version, true );
wp_enqueue_script( 'um_admin_settings' );
$localize_data = array(
'onbeforeunload_text' => __( 'Are sure, maybe some settings not saved', 'ultimate-member' ),
'texts' => array(
'remove' => __( 'Remove', 'ultimate-member' ),
'select' => __( 'Select', 'ultimate-member' )
)
);
wp_localize_script( 'um_admin_settings', 'php_data', $localize_data );
}
+19 -2
View File
@@ -105,8 +105,25 @@ if ( ! class_exists( 'um\core\Form' ) ) {
if ( $arr_options['post']['members_directory'] == 'yes' ) {
$ajax_source_func = $_POST['child_callback'];
if( function_exists( $ajax_source_func ) ){
$arr_options['items'] = call_user_func( $ajax_source_func, $arr_options['field']['parent_dropdown_relationship'] );
if ( function_exists( $ajax_source_func ) ) {
$arr_options['items'] = call_user_func( $ajax_source_func, $arr_options['field']['parent_dropdown_relationship'] );
global $wpdb;
$values_array = $wpdb->get_col( $wpdb->prepare(
"SELECT DISTINCT meta_value
FROM $wpdb->usermeta
WHERE meta_key = %s AND
meta_value != ''",
$arr_options['post']['child_name']
) );
if ( ! empty( $values_array ) ) {
$arr_options['items'] = array_intersect( $arr_options['items'], $values_array );
} else {
$arr_options['items'] = array();
}
wp_send_json( $arr_options );
}
} else {
+2 -2
View File
@@ -1482,8 +1482,8 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
$from_date = (int) min( $value ) + ( $offset * HOUR_IN_SECONDS ); // client time zone offset
$to_date = (int) max( $value ) + ( $offset * HOUR_IN_SECONDS ) + DAY_IN_SECONDS - 1; // time 23:59
$from_date = date('Y/m/d', $from_date);
$to_date = date('Y/m/d', $to_date);
$from_date = date( 'Y/m/d', $from_date );
$to_date = date( 'Y/m/d', $to_date );
$field_query = array(
'key' => $field,
+59 -67
View File
@@ -1,15 +1,15 @@
msgid ""
msgstr ""
"Project-Id-Version: Ultimate Member\n"
"POT-Creation-Date: 2019-11-22 14:42+0800\n"
"PO-Revision-Date: 2019-11-22 14:42+0800\n"
"POT-Creation-Date: 2019-11-22 11:53+0200\n"
"PO-Revision-Date: 2019-11-22 11:54+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: en_US\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.2.4\n"
"X-Generator: Poedit 2.0.6\n"
"X-Poedit-Basepath: ..\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-Flags-xgettext: --add-comments=translators:\n"
@@ -103,7 +103,7 @@ msgstr ""
#: includes/admin/core/class-admin-builder.php:765
#: includes/admin/core/class-admin-dragdrop.php:33
#: includes/admin/core/class-admin-menu.php:106
#: includes/core/class-fields.php:4376
#: includes/core/class-fields.php:4380
msgid "Please login as administrator"
msgstr ""
@@ -145,7 +145,7 @@ msgid "Delete Group"
msgstr ""
#: includes/admin/core/class-admin-builder.php:554
#: includes/admin/core/class-admin-enqueue.php:506
#: includes/admin/core/class-admin-enqueue.php:487
#: includes/admin/core/list-tables/roles-list-table.php:342
#: includes/admin/core/list-tables/roles-list-table.php:410
msgid "Delete"
@@ -181,8 +181,8 @@ msgstr ""
msgid "This field type is not setup correcty."
msgstr ""
#: includes/admin/core/class-admin-builder.php:1170
#: includes/core/class-form.php:159 includes/core/class-form.php:333
#: includes/admin/core/class-admin-builder.php:1168
#: includes/core/class-form.php:176 includes/core/class-form.php:350
#: includes/core/class-password.php:533
msgid "This is not possible for security reasons."
msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
#: includes/admin/templates/form/register_customize.php:80
#: includes/admin/templates/form/register_gdpr.php:27
#: includes/core/class-builtin.php:1135 includes/core/class-builtin.php:1150
#: includes/core/class-member-directory.php:928
#: includes/core/class-member-directory.php:948
#: includes/core/um-filters-members.php:40
msgid "Yes"
msgstr ""
@@ -287,47 +287,24 @@ msgstr ""
msgid "e.g. New Registration Form"
msgstr ""
#: includes/admin/core/class-admin-enqueue.php:235
#: includes/admin/core/class-admin-enqueue.php:266
#: includes/admin/core/class-admin-forms.php:897
#: includes/admin/core/class-admin-forms.php:911
#: includes/admin/core/class-admin-forms.php:1034
#: includes/admin/core/class-admin-forms.php:1043
#: includes/admin/core/class-admin-forms.php:1278
#: includes/admin/core/class-admin-forms.php:1292
#: includes/admin/core/class-admin-notices.php:398
#: includes/core/um-actions-profile.php:670
msgid "Remove"
msgstr ""
#: includes/admin/core/class-admin-enqueue.php:236
#: includes/admin/core/class-admin-enqueue.php:267
#: includes/admin/core/class-admin-forms.php:1113
msgid "Select"
msgstr ""
#: includes/admin/core/class-admin-enqueue.php:264
msgid "Are sure, maybe some settings not saved"
msgstr ""
#: includes/admin/core/class-admin-enqueue.php:494
#: includes/admin/core/class-admin-enqueue.php:475
#: includes/core/class-builtin.php:698 includes/core/class-builtin.php:701
#: includes/core/class-builtin.php:1155 includes/core/class-builtin.php:1158
msgid "Password"
msgstr ""
#: includes/admin/core/class-admin-enqueue.php:498
#: includes/admin/core/class-admin-enqueue.php:479
#: includes/admin/core/class-admin-metabox.php:2227
#: includes/core/class-account.php:109
msgid "Privacy"
msgstr ""
#: includes/admin/core/class-admin-enqueue.php:502
#: includes/admin/core/class-admin-enqueue.php:483
#: includes/core/class-account.php:115
msgid "Notifications"
msgstr ""
#: includes/admin/core/class-admin-enqueue.php:556
#: includes/admin/core/class-admin-enqueue.php:537
msgid "Ultimate Member Blocks"
msgstr ""
@@ -348,10 +325,25 @@ msgstr ""
msgid "No Icon"
msgstr ""
#: includes/admin/core/class-admin-forms.php:897
#: includes/admin/core/class-admin-forms.php:911
#: includes/admin/core/class-admin-forms.php:1034
#: includes/admin/core/class-admin-forms.php:1043
#: includes/admin/core/class-admin-forms.php:1278
#: includes/admin/core/class-admin-forms.php:1292
#: includes/admin/core/class-admin-notices.php:398
#: includes/core/um-actions-profile.php:670
msgid "Remove"
msgstr ""
#: includes/admin/core/class-admin-forms.php:1090
msgid "Select media"
msgstr ""
#: includes/admin/core/class-admin-forms.php:1113
msgid "Select"
msgstr ""
#: includes/admin/core/class-admin-forms.php:1114
msgid "Clear"
msgstr ""
@@ -1305,7 +1297,7 @@ msgid "The text that appears on the button. e.g. Upload"
msgstr ""
#: includes/admin/core/class-admin-metabox.php:1959
#: includes/core/class-fields.php:1631 includes/core/class-fields.php:1672
#: includes/core/class-fields.php:1634 includes/core/class-fields.php:1675
msgid "Upload"
msgstr ""
@@ -3168,7 +3160,7 @@ msgid "UM Action"
msgstr ""
#: includes/admin/core/class-admin-users.php:124
#: includes/core/class-fields.php:2541
#: includes/core/class-fields.php:2544
msgid "Apply"
msgstr ""
@@ -4214,7 +4206,7 @@ msgstr ""
#: includes/admin/templates/modal/dynamic_new_group.php:18
#: includes/admin/templates/modal/fonticons.php:14
#: includes/admin/templates/role/publish.php:24 includes/class-config.php:252
#: includes/core/class-fields.php:2542 includes/core/class-fields.php:2639
#: includes/core/class-fields.php:2545 includes/core/class-fields.php:2642
#: includes/core/um-actions-profile.php:671
#: includes/core/um-actions-profile.php:683
#: includes/core/um-actions-profile.php:871
@@ -4584,7 +4576,7 @@ msgid "Register"
msgstr ""
#: includes/class-config.php:135 includes/class-config.php:789
#: includes/core/class-member-directory.php:1972
#: includes/core/class-member-directory.php:1995
#: includes/core/um-actions-profile.php:1255
#: includes/core/um-actions-user.php:19
msgid "Logout"
@@ -6951,101 +6943,101 @@ msgstr ""
msgid "Undefined"
msgstr ""
#: includes/core/class-fields.php:1256 templates/message.php:6
#: includes/core/class-fields.php:1259 templates/message.php:6
#, php-format
msgid "%s"
msgstr ""
#: includes/core/class-fields.php:1277
#: includes/core/class-fields.php:1280
msgid "Custom Field"
msgstr ""
#: includes/core/class-fields.php:1620
#: includes/core/class-fields.php:1623
msgid "Please upload a valid image!"
msgstr ""
#: includes/core/class-fields.php:1634
#: includes/core/class-fields.php:1637
msgid "Sorry this is not a valid image."
msgstr ""
#: includes/core/class-fields.php:1637
#: includes/core/class-fields.php:1640
msgid "This image is too large!"
msgstr ""
#: includes/core/class-fields.php:1640
#: includes/core/class-fields.php:1643
msgid "This image is too small!"
msgstr ""
#: includes/core/class-fields.php:1643
#: includes/core/class-fields.php:1646
msgid "You can only upload one image"
msgstr ""
#: includes/core/class-fields.php:1675
#: includes/core/class-fields.php:1678
msgid "Sorry this is not a valid file."
msgstr ""
#: includes/core/class-fields.php:1678
#: includes/core/class-fields.php:1681
msgid "This file is too large!"
msgstr ""
#: includes/core/class-fields.php:1681
#: includes/core/class-fields.php:1684
msgid "This file is too small!"
msgstr ""
#: includes/core/class-fields.php:1684
#: includes/core/class-fields.php:1687
msgid "You can only upload one file"
msgstr ""
#: includes/core/class-fields.php:2201
#: includes/core/class-fields.php:2204
msgid "Current Password"
msgstr ""
#: includes/core/class-fields.php:2230
#: includes/core/class-fields.php:2233
msgid "New Password"
msgstr ""
#: includes/core/class-fields.php:2262
#: includes/core/class-fields.php:2265
#, php-format
msgid "Confirm %s"
msgstr ""
#: includes/core/class-fields.php:2496
#: includes/core/class-fields.php:2499
msgid "Upload Photo"
msgstr ""
#: includes/core/class-fields.php:2517 includes/core/class-fields.php:2541
#: includes/core/class-fields.php:2520 includes/core/class-fields.php:2544
#: includes/core/um-actions-profile.php:902
msgid "Change photo"
msgstr ""
#: includes/core/class-fields.php:2541 includes/core/class-fields.php:2638
#: includes/core/class-fields.php:2544 includes/core/class-fields.php:2641
msgid "Processing..."
msgstr ""
#: includes/core/class-fields.php:2563
#: includes/core/class-fields.php:2566
msgid "Upload File"
msgstr ""
#: includes/core/class-fields.php:2605 includes/core/um-filters-fields.php:267
#: includes/core/class-fields.php:2608 includes/core/um-filters-fields.php:267
msgid "This file has been removed."
msgstr ""
#: includes/core/class-fields.php:2608 includes/core/class-fields.php:2638
#: includes/core/class-fields.php:2611 includes/core/class-fields.php:2641
msgid "Change file"
msgstr ""
#: includes/core/class-fields.php:2638
#: includes/core/class-fields.php:2641
msgid "Save"
msgstr ""
#: includes/core/class-fields.php:4109
#: includes/core/class-fields.php:4113
#, php-format
msgid ""
"Your profile is looking a little empty. Why not <a href=\"%s\">add</a> some "
"information!"
msgstr ""
#: includes/core/class-fields.php:4111
#: includes/core/class-fields.php:4115
msgid "This user has not added any information to their profile yet."
msgstr ""
@@ -7135,22 +7127,22 @@ msgstr ""
msgid "User Registered"
msgstr ""
#: includes/core/class-member-directory.php:726
#: includes/core/class-member-directory.php:746
msgid " stars"
msgstr ""
#: includes/core/class-member-directory.php:734
#: includes/core/class-member-directory.php:754
msgid "<strong>Age:</strong>&nbsp;{min_range} - {max_range} years old"
msgstr ""
#: includes/core/class-member-directory.php:1917
#: includes/core/class-member-directory.php:1961
#: includes/core/class-member-directory.php:1940
#: includes/core/class-member-directory.php:1984
#: includes/core/um-actions-profile.php:1222
#: includes/core/um-actions-profile.php:1253
msgid "Edit Profile"
msgstr ""
#: includes/core/class-member-directory.php:1967
#: includes/core/class-member-directory.php:1990
#: includes/core/um-actions-profile.php:1254
msgid "My Account"
msgstr ""
+7
View File
@@ -144,6 +144,13 @@ The plugin works with popular caching plugins by automatically excluding Ultimat
* To learn more about version 2.1 please see this [topic](https://wordpress.org/support/topic/version-2-1-4/)
* UM2.1+ is a significant update to the Member Directories' code base from 2.0.x. Please make sure you take a full-site backup with restore point before updating the plugin
= 2.1.2: November 25, 2019 =
* Enhancements:
* Bugfixes:
= 2.1.1: November 12, 2019 =
* Bugfixes:
+1 -1
View File
@@ -3,7 +3,7 @@
Plugin Name: Ultimate Member
Plugin URI: http://ultimatemember.com/
Description: The easiest way to create powerful online communities and beautiful user profiles with WordPress
Version: 2.1.1
Version: 2.1.2-beta1
Author: Ultimate Member
Author URI: http://ultimatemember.com/
Text Domain: ultimate-member