From f0595c45cca1807555686b0c059138a9368ce614 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Fri, 24 Aug 2018 18:05:38 +0200
Subject: [PATCH] Firewall/alias, add type to grid for
 https://github.com/opnsense/core/issues/1858

---
 .../app/controllers/OPNsense/Firewall/Api/AliasController.php   | 2 +-
 src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/AliasController.php b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/AliasController.php
index e5675d592..b5729abe3 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/AliasController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/AliasController.php
@@ -50,7 +50,7 @@ class AliasController extends ApiMutableModelControllerBase
     {
         return $this->searchBase(
             "aliases.alias",
-            array('enabled', 'name', 'description'),
+            array('enabled', 'name', 'description', 'type'),
             "description"
         );
     }
diff --git a/src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt b/src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt
index 4730f5ffe..b5348e3ac 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt
@@ -238,6 +238,7 @@
                             <th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
                             <th data-column-id="enabled" data-width="6em" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
                             <th data-column-id="name" data-type="string">{{ lang._('Name') }}</th>
+                            <th data-column-id="type" data-type="string">{{ lang._('Type') }}</th>
                             <th data-column-id="description" data-type="string">{{ lang._('Description') }}</th>
                             <th data-column-id="commands" data-width="7em" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th>
                         </tr>