// Add support of list of values in objects definition and set default value for product->condition

2012-01-19 17:25:22 +00:00
parent e73df61f45
commit 6ed4874326
2 changed files with 16 additions and 5 deletions
@@ -712,6 +712,17 @@ abstract class ObjectModelCore
 				if (Tools::isEmpty($value))
 					return 'Property '.get_class($this).'->'.$field.' is empty';

+		// Default value
+		if (!$value && !empty($data['default']))
+		{
+			$value = $data['default'];
+			$this->$field = $value;
+		}
+
+		// Check field values
+		if (!empty($data['values']) && is_array($data['values']) && !in_array($value, $data['values']))
+			return 'Property '.get_class($this).'->'.$field.' has bad value (allowed values are: '.implode(', ', $data['values']).')';
+
 		// Check field size
 		if (!empty($data['size']))
 		{