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

- fixed save form type backend;

Browse Source 
- fixed registration form role setting;
This commit is contained in:
nikitozzzzzzz
2017-08-20 20:49:20 +03:00
parent a1bb992c3b
commit f48bb565ad
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/assets/js/um-admin-form.js
+4 -4
View File
@@ -3,7 +3,7 @@ jQuery(document).ready(function() {
/* Default form tab */
if ( jQuery('.um-admin-boxed-links').length > 0 ) {
var tab = jQuery('.um-admin-boxed-links a[data-role="'+jQuery('input#_um_mode').val()+'"]');
var tab = jQuery('.um-admin-boxed-links a[data-role="'+jQuery('input#form__um_mode').val()+'"]');
tab.parents('.um-admin-boxed-links').find('a').removeClass('um-admin-activebg');
tab.addClass('um-admin-activebg');
@@ -13,7 +13,7 @@ jQuery(document).ready(function() {
jQuery('div#um-admin-form-mode,div#um-admin-form-title,div#um-admin-form-builder,div#um-admin-form-shortcode').show();
jQuery('div[id^="um-admin-form-'+tab.data('role')+'"]').show();
jQuery('.empty-container').css({'border' : 'none'});
jQuery('.um-admin-builder').removeClass().addClass( 'um-admin-builder ' + jQuery('input#_um_mode').val() );
jQuery('.um-admin-builder').removeClass().addClass( 'um-admin-builder ' + jQuery('input#form__um_mode').val() );
}
@@ -29,9 +29,9 @@ jQuery(document).ready(function() {
jQuery('#submitdiv').show();
jQuery('div#um-admin-form-mode,div#um-admin-form-title,div#um-admin-form-builder,div#um-admin-form-shortcode').show();
jQuery('div[id^="um-admin-form-'+tab.data('role')+'"]').show();
jQuery('input#_um_mode').val( tab.data('role') );
jQuery('input#form__um_mode').val( tab.data('role') );
jQuery('.empty-container').css({'border' : 'none'});
jQuery('.um-admin-builder').removeClass().addClass( 'um-admin-builder ' + jQuery('input#_um_mode').val() );
jQuery('.um-admin-builder').removeClass().addClass( 'um-admin-builder ' + jQuery('input#form__um_mode').val() );
});
includes/admin/templates/form/mode.php
+1 -1
View File
@@ -12,6 +12,6 @@
<a href="#" data-role="login"><?php _e('Login Form','ultimate-member'); ?></a>
<input type="hidden" name="_um_mode" id="_um_mode" value="<?php echo UM()->query()->get_meta_value('_um_mode', null, 'register' ); ?>" />
<input type="hidden" name="form[_um_mode]" id="form__um_mode" value="<?php echo UM()->query()->get_meta_value( '_um_mode', null, 'register' ); ?>" />
</div><div class="um-admin-clear"></div>
includes/core/class-form.php
+8 -5
View File
@@ -285,12 +285,16 @@ if ( ! class_exists( 'Form' ) ) {
*/
function assigned_role( $post_id ) {
$global_role = get_option( 'default_role' ); // WP Global settings
$um_global_role = um_get_option( 'register_role' ); // UM Settings Global settings
if ( ! empty( $um_global_role ) )
$global_role = $um_global_role; // Form Global settings
$mode = $this->form_type( $post_id );
$use_custom = get_post_meta( $post_id, "_um_{$mode}_use_custom_settings", true );
$global_role = get_option('default_role'); // Form Global settings
if ( $use_custom ) { // Non-Global settings
if ( $use_custom ) { // Custom Form settings
$role = get_post_meta( $post_id, "_um_{$mode}_role", true );
}
@@ -299,7 +303,6 @@ if ( ! class_exists( 'Form' ) ) {
}
return $role;
}
/**
includes/core/um-actions-register.php
+2 -2
View File
@@ -245,7 +245,7 @@
do_action( 'um_before_new_user_register', $args );
$default_role = get_option( 'default_role', true );
$user_role = UM()->form()->assigned_role( UM()->form()->form_id );
/* if ( empty( $default_role ) )
$default_role = get_option( 'default_role' );*/
@@ -253,7 +253,7 @@
'user_login' => $user_login,
'user_pass' => $user_password,
'user_email' => $user_email,
'role' => $default_role,
'role' => $user_role,
);
$user_id = wp_insert_user( $userdata );