From 6e4fb2187113f0ae7fdf45630d684eeb5982607d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 22 Aug 2016 14:31:03 +0200
Subject: [PATCH] Please cherry-pick: - "hide" these templates when the contact
 is not found - added missing navigation rule

---
 web/WEB-INF/faces-config.xml               |  4 ++++
 web/admin/contact/admin_contact_show.xhtml | 28 ++++++++++++----------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 3b5c96f7..200a86a2 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -596,6 +596,10 @@
 			<from-outcome>admin_show_contact</from-outcome>
 			<to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_show_mobile_provider</from-outcome>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
+		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
 		<from-view-id>/admin/contact/admin_contact_list.xhtml</from-view-id>
diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
index 4dbbab12..3d797098 100644
--- a/web/admin/contact/admin_contact_show.xhtml
+++ b/web/admin/contact/admin_contact_show.xhtml
@@ -24,23 +24,25 @@
 		<ui:define name="content">
 			<h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty beanHelper.contact}" />
 
-			<ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
+			<ui:fragment rendered="#{not empty beanHelper.contact}">
+				<ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
 
-			<div class="para">
-				<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_links.tpl" />
-			</div>
+				<div class="para">
+					<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_links.tpl" />
+				</div>
 
-			<div class="para">
-				<ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
-			</div>
+				<div class="para">
+					<ui:include src="/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl" />
+				</div>
 
-			<div class="para">
-				<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
-			</div>
+				<div class="para">
+					<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl" />
+				</div>
 
-			<div class="para">
-				<ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
-			</div>
+				<div class="para">
+					<ui:include src="/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl" />
+				</div>
+			</ui:fragment>
 		</ui:define>
 	</ui:composition>
 </html>
-- 
2.39.5