From 2f9b4d5cd83a3520d32bf92e9d1958e3dab26f00 Mon Sep 17 00:00:00 2001
From: Jos Schellevis <jos.schellevis@deciso.com>
Date: Mon, 1 Jun 2015 16:10:09 +0200
Subject: [PATCH] (mvc) check if field exists in UImodel grid helper class

---
 .../app/library/OPNsense/Base/UIModelGrid.php  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/opnsense/mvc/app/library/OPNsense/Base/UIModelGrid.php b/src/opnsense/mvc/app/library/OPNsense/Base/UIModelGrid.php
index 7d47f2c11..b55ff67ef 100644
--- a/src/opnsense/mvc/app/library/OPNsense/Base/UIModelGrid.php
+++ b/src/opnsense/mvc/app/library/OPNsense/Base/UIModelGrid.php
@@ -76,15 +76,17 @@ class UIModelGrid
                 $row =  array();
                 $row['uuid'] = $record->getAttributes()['uuid'];
                 foreach ($fields as $fieldname) {
-                    $row[$fieldname] = $record->$fieldname->getNodeData();
-                    if (is_array($row[$fieldname])) {
-                        foreach ($row[$fieldname] as $fieldKey => $fieldValue) {
-                            if ($fieldValue['selected'] == 1) {
-                                $row[$fieldname] = $fieldValue['value'];
-                            }
-                        }
+                    if ($record->$fieldname != null) {
+                        $row[$fieldname] = $record->$fieldname->getNodeData();
                         if (is_array($row[$fieldname])) {
-                            $row[$fieldname] = "##Unlinked";
+                            foreach ($row[$fieldname] as $fieldKey => $fieldValue) {
+                                if ($fieldValue['selected'] == 1) {
+                                    $row[$fieldname] = $fieldValue['value'];
+                                }
+                            }
+                            if (is_array($row[$fieldname])) {
+                                $row[$fieldname] = "##Unlinked";
+                            }
                         }
                     }
                 }