From e42c3d2565f2ed71281a9a6a1e1b47ddba45dea7 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Fri, 7 Sep 2018 19:32:01 +0200
Subject: [PATCH] Firewall/alias add content field to grid, see
 https://github.com/opnsense/core/issues/1858#issuecomment-419412332

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

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 dec228376..9e155ce22 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', 'type'),
+            array('enabled', 'name', 'description', 'type', 'content'),
             "description"
         );
     }
diff --git a/src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt b/src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt
index b5348e3ac..0dd7bdbb2 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt
@@ -237,9 +237,10 @@
                         <tr>
                             <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="name" data-width="20em" data-type="string">{{ lang._('Name') }}</th>
+                            <th data-column-id="type" data-width="12em" data-type="string">{{ lang._('Type') }}</th>
                             <th data-column-id="description" data-type="string">{{ lang._('Description') }}</th>
+                            <th data-column-id="content" data-type="string">{{ lang._('Content') }}</th>
                             <th data-column-id="commands" data-width="7em" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th>
                         </tr>
                         </thead>