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

- changed blocks restriction options;

Browse Source
This commit is contained in:
nikitasinelnikov
2019-01-08 10:36:35 +02:00
parent 6bbfefd304
commit e00d75a76e
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/assets/js/um-admin-blocks.js
+17 -13
View File
@@ -37,18 +37,18 @@ var um_block_restriction = wp.compose.createHigherOrderComponent( function( Bloc
um_condition_fields['um_roles_access'] = ''; um_condition_fields['um_roles_access'] = '';
um_condition_fields['um_message_type'] = ''; um_condition_fields['um_message_type'] = '';
if ( parseInt( props.attributes.um_message_type ) === 0 || typeof props.attributes.um_message_type === 'undefined' ) { if ( parseInt( props.attributes.um_message_type ) === 2 ) {
um_condition_fields['um_message_content'] = 'um_block_settings_hide';
} else {
um_condition_fields['um_message_content'] = ''; um_condition_fields['um_message_content'] = '';
} else {
um_condition_fields['um_message_content'] = 'um_block_settings_hide';
} }
} else { } else {
um_condition_fields['um_message_type'] = ''; um_condition_fields['um_message_type'] = '';
if ( parseInt( props.attributes.um_message_type ) === 0 || typeof props.attributes.um_message_type === 'undefined' ) { if ( parseInt( props.attributes.um_message_type ) === 2 ) {
um_condition_fields['um_message_content'] = 'um_block_settings_hide';
} else {
um_condition_fields['um_message_content'] = ''; um_condition_fields['um_message_content'] = '';
} else {
um_condition_fields['um_message_content'] = 'um_block_settings_hide';
} }
} }
} }
@@ -138,24 +138,28 @@ var um_block_restriction = wp.compose.createHigherOrderComponent( function( Bloc
{ {
type: 'number', type: 'number',
className: um_condition_fields['um_message_type'], className: um_condition_fields['um_message_type'],
label: wp.i18n.__( 'Restriction Message', 'ultimate-member' ), label: wp.i18n.__( 'Restriction Action', 'ultimate-member' ),
value: props.attributes.um_message_type, value: props.attributes.um_message_type,
options: [ options: [
{ {
label: wp.i18n.__( 'Global default message', 'ultimate-member' ), label: wp.i18n.__( 'Hide block', 'ultimate-member' ),
value: 0 value: 0
}, },
{ {
label: wp.i18n.__( 'Custom Message', 'ultimate-member' ), label: wp.i18n.__( 'Show global default message', 'ultimate-member' ),
value: 1 value: 1
},
{
label: wp.i18n.__( 'Show custom message', 'ultimate-member' ),
value: 2
} }
], ],
onChange: function onChange( value ) { onChange: function onChange( value ) {
props.setAttributes({ um_message_type: value }); props.setAttributes({ um_message_type: value });
if ( parseInt( value ) === 0 ) { if ( parseInt( value ) === 2 ) {
um_condition_fields['um_message_content'] = 'um_block_settings_hide';
} else {
um_condition_fields['um_message_content'] = ''; um_condition_fields['um_message_content'] = '';
} else {
um_condition_fields['um_message_content'] = 'um_block_settings_hide';
} }
} }
} }
@@ -165,7 +169,7 @@ var um_block_restriction = wp.compose.createHigherOrderComponent( function( Bloc
{ {
type: 'number', type: 'number',
className: um_condition_fields['um_message_content'], className: um_condition_fields['um_message_content'],
label: wp.i18n.__( 'Message Content', 'ultimate-member' ), label: wp.i18n.__( 'Restriction Message Content', 'ultimate-member' ),
value: props.attributes.um_message_content, value: props.attributes.um_message_content,
onChange: function onChange( value ) { onChange: function onChange( value ) {
props.setAttributes({ um_message_content: value }); props.setAttributes({ um_message_content: value });
includes/core/class-access.php
+6 -6
View File
@@ -1186,9 +1186,9 @@ if ( ! class_exists( 'um\core\Access' ) ) {
if ( ! is_user_logged_in() ) { if ( ! is_user_logged_in() ) {
$block_content = ''; $block_content = '';
if ( isset( $block['attrs']['um_message_type'] ) ) { if ( isset( $block['attrs']['um_message_type'] ) ) {
if ( $block['attrs']['um_message_type'] == '0' ) { if ( $block['attrs']['um_message_type'] == '1' ) {
$block_content = $default_message; $block_content = $default_message;
} elseif ( $block['attrs']['um_message_type'] == '1' ) { } elseif ( $block['attrs']['um_message_type'] == '2' ) {
$block_content = $block['attrs']['um_message_content']; $block_content = $block['attrs']['um_message_content'];
} }
} }
@@ -1204,9 +1204,9 @@ if ( ! class_exists( 'um\core\Access' ) ) {
if ( ! $display ) { if ( ! $display ) {
$block_content = ''; $block_content = '';
if ( isset( $block['attrs']['um_message_type'] ) ) { if ( isset( $block['attrs']['um_message_type'] ) ) {
if ( $block['attrs']['um_message_type'] == '0' ) { if ( $block['attrs']['um_message_type'] == '1' ) {
$block_content = $default_message; $block_content = $default_message;
} elseif ( $block['attrs']['um_message_type'] == '1' ) { } elseif ( $block['attrs']['um_message_type'] == '2' ) {
$block_content = $block['attrs']['um_message_content']; $block_content = $block['attrs']['um_message_content'];
} }
} }
@@ -1219,9 +1219,9 @@ if ( ! class_exists( 'um\core\Access' ) ) {
if ( is_user_logged_in() ) { if ( is_user_logged_in() ) {
$block_content = ''; $block_content = '';
if ( isset( $block['attrs']['um_message_type'] ) ) { if ( isset( $block['attrs']['um_message_type'] ) ) {
if ( $block['attrs']['um_message_type'] == '0' ) { if ( $block['attrs']['um_message_type'] == '1' ) {
$block_content = $default_message; $block_content = $default_message;
} elseif ( $block['attrs']['um_message_type'] == '1' ) { } elseif ( $block['attrs']['um_message_type'] == '2' ) {
$block_content = $block['attrs']['um_message_content']; $block_content = $block['attrs']['um_message_content'];
} }
} }