From 0803a233d05870ee8ce691fc730a947bf5aa0358 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 11 Jan 2024 09:37:51 +0100
Subject: [PATCH] firewall: fix a warning and integrate menu nicer #6383

---
 .../app/controllers/OPNsense/Firewall/FilterController.php  | 1 +
 .../mvc/app/controllers/OPNsense/Firewall/NptController.php | 1 -
 .../controllers/OPNsense/Firewall/SourceNatController.php   | 1 +
 src/opnsense/mvc/app/models/OPNsense/Firewall/ACL/ACL.xml   | 6 +++---
 src/opnsense/mvc/app/models/OPNsense/Firewall/Menu/Menu.xml | 2 +-
 src/opnsense/mvc/app/views/OPNsense/Firewall/filter.volt    | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/FilterController.php b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/FilterController.php
index 461f990a5..e558fe813 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/FilterController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/FilterController.php
@@ -32,6 +32,7 @@ class FilterController extends \OPNsense\Base\IndexController
     public function indexAction()
     {
         $this->view->pick('OPNsense/Firewall/filter');
+        $this->view->SavePointBtns = true;
         $this->view->ruleController = "filter";
         $this->view->gridFields = [
             [
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/NptController.php b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/NptController.php
index 0e69ca4fe..d701a8003 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/NptController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/NptController.php
@@ -33,7 +33,6 @@ class NptController extends \OPNsense\Base\IndexController
     {
         $this->view->pick('OPNsense/Firewall/filter');
         $this->view->ruleController = "npt";
-        $this->view->hideSavePointBtns = true;
         $this->view->gridFields = [
             [
                 'id' => 'enabled', 'formatter' => 'rowtoggle' ,'width' => '6em', 'heading' => gettext('Enabled')
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/SourceNatController.php b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/SourceNatController.php
index 7bc2c632f..9e24cc700 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/SourceNatController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/SourceNatController.php
@@ -32,6 +32,7 @@ class SourceNatController extends \OPNsense\Base\IndexController
     public function indexAction()
     {
         $this->view->pick('OPNsense/Firewall/filter');
+        $this->view->SavePointBtns = true;
         $this->view->ruleController = "source_nat";
         $this->view->gridFields = [
             [
diff --git a/src/opnsense/mvc/app/models/OPNsense/Firewall/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Firewall/ACL/ACL.xml
index 8ed425711..a3360c71e 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Firewall/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Firewall/ACL/ACL.xml
@@ -1,20 +1,20 @@
 <acl>
     <page-filter-api>
-        <name>Firewall: Rules: API</name>
+        <name>Firewall: Automation: Filter</name>
         <patterns>
             <pattern>ui/firewall/filter/*</pattern>
             <pattern>api/firewall/filter/*</pattern>
         </patterns>
     </page-filter-api>
     <page-filter-snat-api>
-        <name>Firewall: SourceNat: API</name>
+        <name>Firewall: Automation: Source NAT</name>
         <patterns>
             <pattern>ui/firewall/source_nat/*</pattern>
             <pattern>api/firewall/source_nat/*</pattern>
         </patterns>
     </page-filter-snat-api>
     <page-firewall-nat-npt>
-        <name>Firewall: NAT: NPT</name>
+        <name>Firewall: NAT: NPTv6</name>
         <patterns>
             <pattern>ui/firewall/npt/*</pattern>
             <pattern>api/firewall/npt/*</pattern>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Firewall/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Firewall/Menu/Menu.xml
index ef242123d..c39018399 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Firewall/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Firewall/Menu/Menu.xml
@@ -1,6 +1,6 @@
 <menu>
     <Firewall>
-        <Automation order="1000" cssClass="fa fa-gear">
+        <Automation cssClass="fa fa-gear">
             <Filter order="50" url="/ui/firewall/filter/">
                 <FilterRef url="/ui/firewall/filter#*" visibility="hidden"/>
             </Filter>
diff --git a/src/opnsense/mvc/app/views/OPNsense/Firewall/filter.volt b/src/opnsense/mvc/app/views/OPNsense/Firewall/filter.volt
index 717453fe9..1b3abb397 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Firewall/filter.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Firewall/filter.volt
@@ -213,7 +213,7 @@
                 data-error-title="{{ lang._('Filter load error') }}"
                 type="button"
         ></button>
-{% if not hideSavePointBtns|default(false) %}
+{% if SavePointBtns is defined %}
         <div class="pull-right">
             <button class="btn" id="savepointAct"
                     data-endpoint='/api/firewall/{{ruleController}}/savepoint'