10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-07-16 13:13:33 +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('');
includes/admin/core/class-admin-builder.php
+8 -29
View File
@@ -54,6 +54,11 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
$validate = $field_attr['validate'];
foreach ( $validate as $post_input => $arr ) {
$skip = apply_filters( 'um_admin_builder_skip_field_validation', false, $post_input, $array );
if ( $skip ) {
continue;
}
$mode = $arr['mode'];
switch ( $mode ) {
@@ -115,42 +120,16 @@ if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
*/
extract( $array );
/**
* UM hook
*
* @type filter
* @title um_fields_without_metakey
* @description Field Types without meta key
* @input_vars
* [{"var":"$types","type":"array","desc":"Field Types"}]
* @change_log
* ["Since: 2.0"]
* @usage add_filter( 'um_fields_without_metakey', 'function_name', 10, 1 );
* @example
* <?php
* add_filter( 'um_fields_without_metakey', 'my_fields_without_metakey', 10, 1 );
* function my_fields_without_metakey( $types ) {
* // your code here
* return $types;
* }
* ?>
*/
$fields_without_metakey = apply_filters( 'um_fields_without_metakey', array(
'block',
'shortcode',
'spacing',
'divider',
'group'
) );
$fields_without_metakey = UM()->builtin()->get_fields_without_metakey();
$fields = UM()->query()->get_attr('custom_fields', $form_id);
$fields = UM()->query()->get_attr( 'custom_fields', $form_id );
$count = 1;
if ( ! empty( $fields ) ) {
$count = count( $fields ) + 1;
}
// set unique meta key
if ( in_array( $field_type, $fields_without_metakey ) || ! isset( $array['post']['_metakey'] ) ) {
if ( in_array( $field_type, $fields_without_metakey ) && ! isset( $array['post']['_metakey'] ) ) {
$array['post']['_metakey'] = "um_{$field_type}_{$form_id}_{$count}";
}
includes/admin/core/class-admin-enqueue.php
+2 -2
View File
@@ -164,8 +164,8 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
*/
function load_role_wrapper() {
wp_register_script( 'um_admin_role_wrapper', $this->js_url . 'um-admin-role-wrapper.js', array( 'jquery' ), ultimatemember_version, true );
$localize_roles_data = get_option( 'um_roles' );
wp_localize_script( 'um_admin_role_wrapper', 'um_roles', $localize_roles_data );
$localize_roles_data = get_option( 'um_roles' );
wp_localize_script( 'um_admin_role_wrapper', 'um_roles', (array) $localize_roles_data );
wp_enqueue_script( 'um_admin_role_wrapper' );
}