From 8609dfb8e8c124ef20f0ad82cfb7e552af57c34c Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 11 Mar 2020 12:36:29 +0100
Subject: [PATCH] os-firewall: rename endpoints for
 https://github.com/opnsense/plugins/issues/1720

---
 .../OPNsense/Firewall/Api/FilterController.php       | 12 ++++++------
 .../mvc/app/views/OPNsense/Firewall/filter.volt      | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php b/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php
index 62116a88d..8bc560b12 100644
--- a/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php
+++ b/net/firewall/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterController.php
@@ -36,32 +36,32 @@ class FilterController extends ApiMutableModelControllerBase
     protected static $internalModelName = 'filter';
     protected static $internalModelClass = 'OPNsense\Firewall\Filter';
 
-    public function searchItemAction()
+    public function searchRuleAction()
     {
         return $this->searchBase("rules.rule", array('enabled', 'sequence', 'description'), "sequence");
     }
 
-    public function setItemAction($uuid)
+    public function setRuleAction($uuid)
     {
         return $this->setBase("rule", "rules.rule", $uuid);
     }
 
-    public function addItemAction()
+    public function addRuleAction()
     {
         return $this->addBase("rule", "rules.rule");
     }
 
-    public function getItemAction($uuid = null)
+    public function getRuleAction($uuid = null)
     {
         return $this->getBase("rule", "rules.rule", $uuid);
     }
 
-    public function delItemAction($uuid)
+    public function delRuleAction($uuid)
     {
         return $this->delBase("rules.rule", $uuid);
     }
 
-    public function toggleItemAction($uuid, $enabled = null)
+    public function toggleRuleAction($uuid, $enabled = null)
     {
         return $this->toggleBase("rules.rule", $uuid, $enabled);
     }
diff --git a/net/firewall/src/opnsense/mvc/app/views/OPNsense/Firewall/filter.volt b/net/firewall/src/opnsense/mvc/app/views/OPNsense/Firewall/filter.volt
index e6191dba6..b49837244 100644
--- a/net/firewall/src/opnsense/mvc/app/views/OPNsense/Firewall/filter.volt
+++ b/net/firewall/src/opnsense/mvc/app/views/OPNsense/Firewall/filter.volt
@@ -2,12 +2,12 @@
     $( document ).ready(function() {
         let initial_load = true;
         let grid = $("#grid-rules").UIBootgrid({
-            search:'/api/firewall/filter/searchItem/',
-            get:'/api/firewall/filter/getItem/',
-            set:'/api/firewall/filter/setItem/',
-            add:'/api/firewall/filter/addItem/',
-            del:'/api/firewall/filter/delItem/',
-            toggle:'/api/firewall/filter/toggleItem/'
+            search:'/api/firewall/filter/searchRule/',
+            get:'/api/firewall/filter/getRule/',
+            set:'/api/firewall/filter/setRule/',
+            add:'/api/firewall/filter/addRule/',
+            del:'/api/firewall/filter/delRule/',
+            toggle:'/api/firewall/filter/toggleRule/'
         });
 
         // open edit dialog when opened with a uuid reference