From e00d75a76eb3367a80ca603baaa3b2001202345d Mon Sep 17 00:00:00 2001
From: nikitasinelnikov <nsinelnikov.work@gmail.com>
Date: Tue, 8 Jan 2019 10:36:35 +0200
Subject: [PATCH] - changed blocks restriction options;

---
 includes/admin/assets/js/um-admin-blocks.js | 30 ++++++++++++---------
 includes/core/class-access.php              | 12 ++++-----
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/includes/admin/assets/js/um-admin-blocks.js b/includes/admin/assets/js/um-admin-blocks.js
index 0f1dd7f7..61185028 100644
--- a/includes/admin/assets/js/um-admin-blocks.js
+++ b/includes/admin/assets/js/um-admin-blocks.js
@@ -37,18 +37,18 @@ var um_block_restriction = wp.compose.createHigherOrderComponent( function( Bloc
 				um_condition_fields['um_roles_access'] = '';
 				um_condition_fields['um_message_type'] = '';
 
-				if ( parseInt( props.attributes.um_message_type ) === 0 || typeof props.attributes.um_message_type === 'undefined' ) {
-					um_condition_fields['um_message_content'] = 'um_block_settings_hide';
-				} else {
+				if ( parseInt( props.attributes.um_message_type ) === 2 ) {
 					um_condition_fields['um_message_content'] = '';
+				} else {
+					um_condition_fields['um_message_content'] = 'um_block_settings_hide';
 				}
 			} else {
 				um_condition_fields['um_message_type'] = '';
 
-				if ( parseInt( props.attributes.um_message_type ) === 0 || typeof props.attributes.um_message_type === 'undefined' ) {
-					um_condition_fields['um_message_content'] = 'um_block_settings_hide';
-				} else {
+				if ( parseInt( props.attributes.um_message_type ) === 2 ) {
 					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',
 							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,
 							options: [
 								{
-									label: wp.i18n.__( 'Global default message', 'ultimate-member' ),
+									label: wp.i18n.__( 'Hide block', 'ultimate-member' ),
 									value: 0
 								},
 								{
-									label: wp.i18n.__( 'Custom Message', 'ultimate-member' ),
+									label: wp.i18n.__( 'Show global default message', 'ultimate-member' ),
 									value: 1
+								},
+								{
+									label: wp.i18n.__( 'Show custom message', 'ultimate-member' ),
+									value: 2
 								}
 							],
 							onChange: function onChange( value ) {
 								props.setAttributes({ um_message_type: value });
-								if ( parseInt( value ) === 0 ) {
-									um_condition_fields['um_message_content'] = 'um_block_settings_hide';
-								} else {
+								if ( parseInt( value ) === 2 ) {
 									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',
 							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,
 							onChange: function onChange( value ) {
 								props.setAttributes({ um_message_content: value });
diff --git a/includes/core/class-access.php b/includes/core/class-access.php
index c7d2b714..28132124 100644
--- a/includes/core/class-access.php
+++ b/includes/core/class-access.php
@@ -1186,9 +1186,9 @@ if ( ! class_exists( 'um\core\Access' ) ) {
 					if ( ! is_user_logged_in() ) {
 						$block_content = '';
 						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;
-							} elseif ( $block['attrs']['um_message_type'] == '1' ) {
+							} elseif ( $block['attrs']['um_message_type'] == '2' ) {
 								$block_content = $block['attrs']['um_message_content'];
 							}
 						}
@@ -1204,9 +1204,9 @@ if ( ! class_exists( 'um\core\Access' ) ) {
 							if ( ! $display ) {
 								$block_content = '';
 								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;
-									} elseif ( $block['attrs']['um_message_type'] == '1' ) {
+									} elseif ( $block['attrs']['um_message_type'] == '2' ) {
 										$block_content = $block['attrs']['um_message_content'];
 									}
 								}
@@ -1219,9 +1219,9 @@ if ( ! class_exists( 'um\core\Access' ) ) {
 					if ( is_user_logged_in() ) {
 						$block_content = '';
 						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;
-							} elseif ( $block['attrs']['um_message_type'] == '1' ) {
+							} elseif ( $block['attrs']['um_message_type'] == '2' ) {
 								$block_content = $block['attrs']['um_message_content'];
 							}
 						}