gpro-enable-when-dynamically-populated.php: Updated to choice-based fields as readonly when the dynamically populated value matches an existing choice.

Author: spivurno

gp-read-only/gpro-enable-when-dynamically-populated.php

@@ -12,26 +12,28 @@
 
 	foreach ( $form['fields'] as &$field ) {
 
-		if ( $field->gwreadonly_enable ) {
+		if ( ! $field->gwreadonly_enable ) {
+			continue;
+		}
 
-			$value               = GFFormsModel::get_field_value( $field, $field_values, false ) || $field->gppa_hydrated_value;
-			$has_matching_choice = false;
+		$value = GFFormsModel::get_field_value( $field, $field_values, false ) || $field->gppa_hydrated_value;
 
-			// If we have a value and we're populating a choice-based field, make sure the value matches a choice.
-			if ( $value && ! empty( $field->choices ) ) {
-				foreach ( $field->choices as $choice ) {
-					if ( $choice['value'] == $value ) {
-						$has_matching_choice = true;
-						break;
-					}
+		// If we have a value and we're populating a choice-based field, make sure the value matches a choice.
+		if ( $value && ! empty( $field->choices ) ) {
+			$has_matching_choice = false;
+			foreach ( $field->choices as $choice ) {
+				if ( $choice['value'] == $value ) {
+					$has_matching_choice = true;
+					break;
 				}
 			}
 
-			if ( ! $value || ! $has_matching_choice ) {
-				$field->gwreadonly_enable = false;
-			}
+		}
 
+		if ( ! $value || ( isset( $has_matching_choice ) && ! $has_matching_choice ) ) {
+			$field->gwreadonly_enable = false;
 		}
+
 	}
 
 	return $form;