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 'master' of https://github.com/ultimatemember/ultimatemember into beta/2.1.0

Browse Source
This commit is contained in:
nikitasinelnikov
2019-09-05 14:05:41 +03:00
parent 95dfbda87a ff1484858b
commit 43ebcbd27f
9 changed files with 179 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/assets/js/um-admin-modal.js
+4 -2
View File
@@ -97,6 +97,8 @@ function um_admin_modal_ajaxcall( act_id, arg1, arg2, arg3 ) {
in_column = jQuery('.um-col-demon-settings').data('in_column');
in_group = jQuery('.um-col-demon-settings').data('in_group');
}
var form_mode = jQuery('input[type=hidden][id=form__um_mode]').val();
jQuery.ajax({
url: wp.ajax.settings.url,
@@ -111,7 +113,8 @@ function um_admin_modal_ajaxcall( act_id, arg1, arg2, arg3 ) {
in_sub_row: in_sub_row,
in_column: in_column,
in_group: in_group,
nonce: um_admin_scripts.nonce
nonce: um_admin_scripts.nonce,
form_mode: form_mode
},
complete: function(){
um_admin_modal_loaded();
@@ -126,7 +129,6 @@ function um_admin_modal_ajaxcall( act_id, arg1, arg2, arg3 ) {
jQuery( "#_custom_dropdown_options_source" ).trigger('blur');
if ( jQuery('.um-admin-editor:visible').length > 0 ) {
if ( act_id == 'um_admin_edit_field_popup' ) {
includes/core/class-fields.php
+31 -1
View File
@@ -39,7 +39,18 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
* @param bool $checked
*/
function checkbox( $id, $title, $checked = true ) {
$class = $checked ? 'um-icon-android-checkbox-outline' : 'um-icon-android-checkbox-outline-blank'; ?>
/**
* Set value on form submission
*/
if( isset( $_REQUEST[ $id ] ) ){
$checked = $_REQUEST[ $id ];
}
$class = $checked ? 'um-icon-android-checkbox-outline' : 'um-icon-android-checkbox-outline-blank';
?>
<div class="um-field um-field-c">
<div class="um-field-area">
@@ -2643,14 +2654,33 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
um_user( $data['parent_dropdown_relationship'] )
) {
$options = call_user_func( $data['custom_dropdown_options_source'], $data['parent_dropdown_relationship'] );
$disabled_by_parent_option = '';
if ( um_user( $form_key ) ) {
$select_original_option_value = " data-um-original-value='" . um_user( $form_key ) . "' ";
}
}
}
// Child dropdown option selected
if( isset( UM()->form()->post_form[ $form_key ] ) ){
$select_original_option_value = " data-um-original-value='" . esc_attr( UM()->form()->post_form[ $form_key ] ) . "' ";
}
// Child dropdown
if( $has_parent_option ){
if ( ! empty( $data['custom_dropdown_options_source'] ) && $has_parent_option && function_exists( $data['custom_dropdown_options_source'] ) &&
isset( UM()->form()->post_form[ $form_key ] )
) {
$options = call_user_func( $data['custom_dropdown_options_source'], $data['parent_dropdown_relationship'] );
}
}
if ( ! empty( $data['custom_dropdown_options_source'] ) ) {
/**