Set rest read/write status on cmb object instead of CMB2_REST_Access object.

jtsternberg · jtsternberg · commit 889cb638c9fe · 2016-09-08T12:19:37.000-05:00
diff --git a/includes/CMB2.php b/includes/CMB2.php
@@ -69,6 +69,8 @@ class CMB2 extends CMB2_Base {
 		'taxonomies'       => array(),
 		'new_user_section' => 'add-new-user', // or 'add-existing-user'
 		'new_term_section' => true,
+		'rest_read'        => false,
+		'rest_write'       => false,
 	);
 
 	/**
diff --git a/includes/CMB2_REST_Access.php b/includes/CMB2_REST_Access.php
@@ -51,9 +51,9 @@ public function __construct( CMB2 $cmb ) {
 		$this->cmb = $cmb;
 		self::$boxes[ $cmb->cmb_id ] = $cmb;
 
-		$show_value      = $this->cmb->prop( 'show_in_rest' );
-		$this->can_read  = 'write_only' !== $show_value;
-		$this->can_write = in_array( $show_value, array( 'read_and_write', 'write_only' ), true );
+		$show_value = $this->cmb->prop( 'show_in_rest' );
+		$this->cmb->rest_read  = 'write_only' !== $show_value;
+		$this->cmb->rest_write = in_array( $show_value, array( 'read_and_write', 'write_only' ), true );
 	}
 
 	public function universal_hooks() {
@@ -100,7 +100,7 @@ protected function prepare_read_write_fields() {
 	}
 
 	protected function maybe_add_read_field( $field_id, $show_in_rest ) {
-		$can_read = $this->can_read
+		$can_read = $this->cmb->rest_read
 			? 'write_only' !== $show_in_rest
 			: in_array( $show_in_rest, array( 'read_and_write', 'read_only' ), true );
 
@@ -110,7 +110,7 @@ protected function maybe_add_read_field( $field_id, $show_in_rest ) {
 	}
 
 	protected function maybe_add_write_field( $field_id, $show_in_rest ) {
-		$can_update = $this->can_write
+		$can_update = $this->cmb->rest_write
 			? 'read_only' !== $show_in_rest
 			: in_array( $show_in_rest, array( 'read_and_write', 'write_only' ), true );
 
@@ -237,7 +237,7 @@ public function field_can_update( $field_id ) {
 
 		$field        = $this->cmb->get_field( $field_id );
 		$show_in_rest = $field ? $field->args( 'show_in_rest' ) : 'no';
-		$can_update   = $this->can_write
+		$can_update   = $this->cmb->rest_write
 			? 'read_only' !== $show_in_rest
 			: in_array( $show_in_rest, array( 'read_and_write', 'write_only' ), true );
 
diff --git a/tests/test-cmb-core.php b/tests/test-cmb-core.php
@@ -117,6 +117,8 @@ public function setUp() {
 			'taxonomies'       => array(),
 			'new_user_section' => 'add-new-user', // or 'add-existing-user'
 			'new_term_section' => true,
+			'rest_read'        => false,
+			'rest_write'       => false,
 		);
 
 		$this->cmb = new CMB2( $this->metabox_array );
