Please cherry-pick:

- currently not otherwise possible: if contact's fax number from user profile is being unlinked/linked, a redirect to admin_contact_show happens as no user id is available at this time

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 689302fd07167625eaf3bb95fbdf77e6abec1696..6b921d2520ce5ba8463ac504b365ef1a4e9d86da 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -380,6 +380,10 @@
                        <from-outcome>admin_edit_contact</from-outcome>
                        <to-view-id>/admin/contact/admin_contact_edit.xhtml</to-view-id>
                </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_show_contact</from-outcome>
+                       <to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
+               </navigation-case>
        </navigation-rule>
        <navigation-rule>
                <from-view-id>/admin/contact/admin_contact_show.xhtml</from-view-id>