Merge pull request #987 from cloudinary/fix/delivery-ui-readonly

When on read only mode, do not assume that the checkbox is checked

Author: pereirinha

php/ui/component/class-on-off.php

@@ -123,8 +123,9 @@ protected function shadow( $struct ) {
 			$struct                           = $this->get_part( 'input' );
 			$struct['attributes']['type']     = 'checkbox';
 			$struct['attributes']['disabled'] = 'disabled';
-			$struct['attributes']['checked']  = 'checked';
-			$struct['attributes']['type']     = 'checkbox';
+			if ( 'on' === $this->setting->get_value() ) {
+				$struct['attributes']['checked'] = 'checked';
+			}
 		}
 
 		return $struct;

ui-definitions/settings-image.php

@@ -55,7 +55,8 @@
 						'data-context' => 'image',
 					),
 					'readonly'           => static function () {
-						return ! get_plugin_instance()->get_component( 'storage' )->is_local_full();
+						$plugin = get_plugin_instance();
+						return 'on' === $plugin->settings->get_value( 'image_delivery' ) && ! $plugin->get_component( 'storage' )->is_local_full();
 					},
 					'readonly_message'   => sprintf(
 						// translators: %s is a link to the storage settings page.

ui-definitions/settings-video.php

@@ -55,7 +55,8 @@
 						'data-context' => 'video',
 					),
 					'readonly'           => static function () {
-						return ! get_plugin_instance()->get_component( 'storage' )->is_local_full();
+						$plugin = get_plugin_instance();
+						return 'on' === $plugin->settings->get_value( 'video_delivery' ) && ! $plugin->get_component( 'storage' )->is_local_full();
 					},
 					'readonly_message'   => sprintf(
 						// translators: %s is a link to the storage settings page.