diff --git a/plist b/plist index 11b33c695..d727b2e3c 100644 --- a/plist +++ b/plist @@ -714,6 +714,7 @@ /usr/local/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/GroupField.php /usr/local/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/GroupNameField.php /usr/local/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/InterfaceField.php +/usr/local/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/ScheduleField.php /usr/local/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/SourceNatRuleField.php /usr/local/opnsense/mvc/app/models/OPNsense/Firewall/Filter.php /usr/local/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogFilterRule.xml b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogFilterRule.xml index 48556fe28..9b428ee70 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogFilterRule.xml +++ b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogFilterRule.xml @@ -148,6 +148,11 @@ Use this to choose TCP flags that must be cleared for this rule to match. true + + rule.sched + + dropdown + header diff --git a/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/ScheduleField.php b/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/ScheduleField.php new file mode 100644 index 000000000..62f9d4a78 --- /dev/null +++ b/src/opnsense/mvc/app/models/OPNsense/Firewall/FieldTypes/ScheduleField.php @@ -0,0 +1,51 @@ +object(); + if (empty(self::$schedules) && isset($cnf->schedules->schedule)) { + foreach ($cnf->schedules->schedule as $node) { + if (!empty((string)$node->name)) { + self::$schedules[(string)$node->name] = (string)$node->name; + } + } + } + $this->internalOptionList = self::$schedules; + return parent::actionPostLoadingEvent(); + } +} diff --git a/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml b/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml index 9678f6192..c60d2a8cc 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml +++ b/src/opnsense/mvc/app/models/OPNsense/Firewall/Filter.xml @@ -246,6 +246,7 @@ Y Related category not found. +