Please cherry-pick:

- "hide" these templates when the contact is not found
- added missing navigation rule

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 3b5c96f7c35966a8fcf9ed6302f44ff3835892ef..200a86a2ac93d32067793b2e78cf9d738c22f007 100644 (file)
--- 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 4dbbab12115c13fdbf4ab12b7cba23f817df9dee..3d7970983b7afa7d8ddbf78243d85ceb9f2b4b85 100644 (file)
--- 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>