10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-19 06:33:50 +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-08-28 17:09:45 +03:00
parent 4cfc3790f7 d6c00a717c
commit 87f0e03605
78 changed files with 1607 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/assets/js/um-admin-blocks-shortcode.js
+2 -2
View File
@@ -18,7 +18,7 @@
UmRegisterBlockType('um-block/um-forms', {
title: i18n.__( 'UM Form' , 'ultimate-member' ),
description: i18n.__( 'Chose display form', 'ultimate-member' ),
description: i18n.__( 'Choose display form', 'ultimate-member' ),
icon: 'forms',
category: 'um-blocks',
attributes: {
@@ -147,7 +147,7 @@
UmRegisterBlockType( 'um-block/um-member-directories', {
title: i18n.__( 'UM Member Directories', 'ultimate-member'),
description: i18n.__( 'Chose display form', 'ultimate-member' ),
description: i18n.__( 'Choose display form', 'ultimate-member' ),
icon: 'groups',
category: 'um-blocks',
attributes: {
includes/admin/assets/js/um-admin-role-wrapper.js
+9
View File
@@ -1,6 +1,11 @@
jQuery( document ).ready( function() {
jQuery( '#role' ).change( function() {
if ( typeof um_roles == 'object' ) {
um_roles = Object.keys( um_roles ).map(function( key ) { return um_roles[ key ]; });
}
if ( jQuery.inArray( jQuery(this).val().substr(3), um_roles ) !== -1 ) {
jQuery( '#um_role_selector_wrapper' ).hide();
jQuery( '#um-role' ).val('');
@@ -10,6 +15,10 @@ jQuery( document ).ready( function() {
}).trigger('change');
jQuery( '#adduser-role' ).change( function() {
if ( typeof um_roles == 'object' ) {
um_roles = Object.keys( um_roles ).map(function( key ) { return um_roles[ key ]; });
}
if ( jQuery.inArray( jQuery(this).val().substr(3), um_roles ) !== -1 ) {
jQuery( '#um_role_existing_selector_wrapper' ).hide();
jQuery( '#um-role' ).val('');