mvc: fix default issue with models and try to simplify (part 1 of a few)

This commit is contained in:
Franco Fichtner 2023-08-31 10:15:56 +02:00
parent e22ea99d12
commit 2d166a9a97
7 changed files with 14 additions and 43 deletions

View File

@ -30,7 +30,6 @@
<authservers type="AuthenticationServerField">
<Required>N</Required>
<multiple>Y</multiple>
<default>Local Database</default>
</authservers>
<alwaysSendAccountingReqs type="BooleanField">
<default>0</default>

View File

@ -1,29 +1,12 @@
<model>
<mount>//system/firmware</mount>
<version>1.0.1</version>
<description>
OPNsense Firmware settings
</description>
<description>OPNsense Firmware settings</description>
<items>
<mirror type="TextField">
<Required>N</Required>
<default></default>
</mirror>
<flavour type="TextField">
<Required>N</Required>
<default></default>
</flavour>
<plugins type="TextField">
<Required>N</Required>
<default></default>
</plugins>
<type type="TextField">
<Required>N</Required>
<default></default>
</type>
<subscription type="TextField">
<Required>N</Required>
<default></default>
</subscription>
<mirror type="TextField"/>
<flavour type="TextField"/>
<plugins type="TextField"/>
<type type="TextField"/>
<subscription type="TextField"/>
</items>
</model>

View File

@ -8,7 +8,6 @@
<capture>
<interfaces type="InterfaceField">
<Required>N</Required>
<default></default>
<multiple>Y</multiple>
<filters>
<enable>/^(?!0).*$/</enable>
@ -16,7 +15,6 @@
</interfaces>
<egress_only type="InterfaceField">
<Required>N</Required>
<default></default>
<multiple>Y</multiple>
<filters>
<enable>/^(?!0).*$/</enable>

View File

@ -19,17 +19,16 @@
</OptionValues>
</fam>
<source_address type="NetworkField">
<Required>N</Required>
<NetMaskAllowed>N</NetMaskAllowed>
<ValidationMessage>Provide a valid source address</ValidationMessage>
<Required>N</Required>
<NetMaskAllowed>N</NetMaskAllowed>
<ValidationMessage>Provide a valid source address</ValidationMessage>
</source_address>
<packetsize type="IntegerField">
<Required>N</Required>
<MinimumValue>1</MinimumValue>
<MaximumValue>65535</MaximumValue>
</packetsize>
<disable_frag type="BooleanField">
<default>0</default>
</disable_frag>
<disable_frag type="BooleanField"/>
<description type="TextField">
<Required>N</Required>
<mask>/^(.){1,255}$/u</mask>

View File

@ -64,7 +64,6 @@
</sslverify>
<logfile type="TextField">
<Required>N</Required>
<default>syslog facility log_daemon</default>
<mask>/^(\/[^\/ ]*)+\/?|syslog.*$/</mask>
<ValidationMessage>Should be a valid absolute path to the log file or the keyword "syslog".</ValidationMessage>
</logfile>
@ -166,7 +165,6 @@
<Required>N</Required>
</format>
<reminder type="IntegerField">
<default>10</default>
<Required>N</Required>
<MinimumValue>0</MinimumValue>
<MaximumValue>86400</MaximumValue>

View File

@ -15,6 +15,7 @@
</hostname>
<template type="TextField"/>
<local_port type="IntegerField">
<Required>N</Required>
<MinimumValue>1</MinimumValue>
<MaximumValue>65535</MaximumValue>
<ValidationMessage>Port needs to be an integer value between 1 and 65535</ValidationMessage>
@ -27,14 +28,8 @@
<default>1</default>
<Required>Y</Required>
</validate_server_cn>
<cryptoapi type="BooleanField">
<default>0</default>
<Required>N</Required>
</cryptoapi>
<auth_nocache type="BooleanField">
<default>0</default>
<Required>N</Required>
</auth_nocache>
<cryptoapi type="BooleanField"/>
<auth_nocache type="BooleanField"/>
<plain_config type="TextField"/>
</server>
</servers>

View File

@ -48,7 +48,6 @@
<alert>alert</alert>
<emerg>emergency</emerg>
</OptionValues>
<default>info,notice,warn,err,crit,alert,emerg</default>
</level>
<facility type="OptionField">
<Required>N</Required>