Merge pull request #78 from Google-IO-Extended-Grand-Rapids/bugfix/nu…

…ll_view null checks on view
Google-IO-Extended-Grand-Rapids · May 17, 2015 · f440580 · f440580
2 parents 33c948c + 72e6832
commit f440580
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/resources/templates/conference.html b/src/main/resources/templates/conference.html
@@ -40,7 +40,7 @@ <h3>All Conferences</h3>
         <td th:text="${conference.startDate}"></td>
         <td th:text="${conference.endDate}"></td>
         <td th:text="${conference.lastUpdateDttm}"></td>
-        <td th:text="${conference.locationView.id} + ' - ' + ${conference.locationView.shortDesc}"></td>
+        <td th:text="${conference.locationView != null} ? ${conference.locationView.id} + ' - ' + ${conference.locationView.shortDesc}"></td>
         <td>  <form th:action="@{/admin/conference}" th:method="delete"><input type="hidden" name="id"  th:value="${conference.id}" /><input type="submit" value="Delete" /></form></td>
     </tr>
 </table>

diff --git a/src/main/resources/templates/presenter.html b/src/main/resources/templates/presenter.html
@@ -31,7 +31,7 @@ <h3>All Presenters</h3>
         <td th:text="${presenter.userId}"></td>
         <td th:text="${presenter.shortBio}"></td>
         <td th:text="${presenter.jobTitle}"></td>
-        <td th:text="${presenter.companyView.name}"></td>
+        <td th:text="${presenter.companyView != null} ? presenter.companyView.name"></td>
         <td>  <form th:action="@{/admin/presenter}" th:method="delete"><input type="hidden" name="id"  th:value="${presenter.id}" /><input type="submit" value="Delete" /></form></td>
     </tr>
 </table>