Dnat: Put enabled below disabled in model

Author: TomWalraven

src/opnsense/mvc/app/models/OPNsense/Firewall/DNat.xml

@@ -11,9 +11,9 @@
                 <Required>Y</Required>
                 <!-- Intentionally no default set as its applied by actionPostLoadingEvent() -->
             </sequence>
-            <enabled type=".\DNatEnabledField" volatile="true"/>
             <!-- legacy disabled flag for compatibility -->
             <disabled type="BooleanField"/>
+            <enabled type=".\DNatEnabledField" volatile="true"/>
             <nordr type="BooleanField"/>
             <interface type="InterfaceField">
                 <Multiple>Y</Multiple>

src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/DNatEnabledField.php

@@ -38,25 +38,17 @@ public function setValue($value)
             return;
         }
         $value = (string)$value;
-        $parent = $this->getParentNode();
         // Set disabled value opposite of enabled value for legacy compatibility.
-        if ($parent !== null && isset($parent->disabled) && $value !== '') {
-            $parent->disabled = $value === '1' ? '0' : '1';
-        }
+        $this->getParentNode()->disabled = $value === '1' ? '0' : '1';
         return parent::setValue($value);
     }
 
     public function getValue(): string
     {
-        $value = parent::getValue();
-        $isNotInitialized = $this->internalInitialValue === false;
-        // Get value from disabled flag if enabled does not have a value set.
-        if ($isNotInitialized || $value === '') {
-            $parent = $this->getParentNode();
-            if ($parent !== null && isset($parent->disabled)) {
-                return (string)$parent->disabled === '1' ? '0' : '1';
-            }
+        $parent = $this->getParentNode();
+        if ($parent !== null && isset($parent->disabled)) {
+            return (string)$parent->disabled === '1' ? '0' : '1';
         }
-        return $value;
+        return parent::getValue();
     }
 }