(model, constraints) add getOptionValueList() to BaseConstraint, move code from UniqueConstraint

src/opnsense/mvc/app/models/OPNsense/Base/Constraints/BaseConstraint.php

@@ -50,4 +50,21 @@ abstract class BaseConstraint extends Validator implements ValidatorInterface
         }
         $validator->appendMessage(new Message($message, $attribute, $name));
     }
+
+    /**
+     * retrieve option value list
+     * @param $fieldname
+     * @return mixed
+     */
+    protected function getOptionValueList($fieldname)
+    {
+        $result = array();
+        $options = $this->getOption($fieldname);
+        if (!empty($options)) {
+            foreach ($options as $option) {
+                $result[] = $option;
+            }
+        }
+        return $result;
+    }
 }

src/opnsense/mvc/app/models/OPNsense/Base/Constraints/UniqueConstraint.php

@@ -44,7 +44,6 @@ class UniqueConstraint extends BaseConstraint
     public function validate(\Phalcon\Validation $validator, $attribute)
     {
         $node = $this->getOption('node');
-        $addFields = $this->getOption('addFields');
         $fieldSeparator = chr(10) . chr(0);
         if ($node) {
             $containerNode = $node;
@@ -60,11 +59,7 @@ class UniqueConstraint extends BaseConstraint
             if ($containerNode != null && $level == 2) {
                 // collect (additional) key fields
                 $keyFields = array($nodeName);
-                if (!empty($addFields)) {
-                    foreach ($addFields as $field) {
-                        $keyFields[] = $field;
-                    }
-                }
+                $keyFields = array_merge($keyFields, $this->getOptionValueList('addFields'));
                 // calculate the key for this node
                 $nodeKey = '';
                 foreach ($keyFields as $field) {