Fix null ref on empty grid message #104

programcsharp · programcsharp · commit 21765ff37648 · 2020-03-21T09:21:08.000-07:00
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>

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@`
`311`	`311`	`</tfoot>`
`312`	`312`	`}`
`313`	`313`
`314`		`-@if (settings.EmptyGridMessage != null) {`
	`314`	`+@if (settings.EmptyGridMessage != null \|\| settings.EmptyGridMessageTemplate != null) {`
`315`	`315`	`<tfoot class="empty-grid-message" style="@(Model.Total > 0 ? "display:none;" : null)">`
`316`	`316`	`<tr>`
`317`	`317`	`<td colspan="@settings.Columns.Where(x => x.Visible).Count()">`
`@@ -321,7 +321,7 @@`
`321`	`321`	`}`
`322`	`322`	`else`
`323`	`323`	`{`
`324`		`- @Model.Settings.EmptyGridMessage`
	`324`	`+ @settings.EmptyGridMessage`
`325`	`325`	`}`
`326`	`326`	`</td>`
`327`	`327`	`</tr>`