Fix null ref on empty grid message #104

programcsharp · Mar 21, 2020 · 21765ff · 21765ff
1 parent 44d9408
commit 21765ff
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Griddly/Views/Shared/Griddly/Griddly.cshtml b/Griddly/Views/Shared/Griddly/Griddly.cshtml
@@ -311,7 +311,7 @@
     </tfoot>
 }
 
-@if (settings.EmptyGridMessage != null) {
+@if (settings.EmptyGridMessage != null || settings.EmptyGridMessageTemplate != null) {
     <tfoot class="empty-grid-message" style="@(Model.Total > 0 ? "display:none;" : null)">
         <tr>
             <td colspan="@settings.Columns.Where(x => x.Visible).Count()">
@@ -321,7 +321,7 @@
                 }
                 else
                 {
-                    @Model.Settings.EmptyGridMessage
+                    @settings.EmptyGridMessage
                 }
             </td>
         </tr>